Revert r84658 and r84691. They were causing llvm-gcc bootstrap to fail.