Temporarily revert r68552. This was causing a failure in the self-hosting LLVM