This reverts commit ba430f50. Which appears to have caused a failure on the lld-x86_64-ubuntu-fast buildbot.