Revert r67798: it breaks llvm-gcc bootstrap on x86-64-linux, presumably due to