Revert r77654, it appears to be causing llvm-gcc bootstrap failures, and many