Revert r59802. It was breaking the build of llvm-gcc: