Revert 114634 for now since buildbot claim it broke Clang self-hosting. I...

Revert 114634 for now since buildbot claim it broke Clang self-hosting. I doubt it but it's possible it's exposing another bug somewhere.

llvm-svn: 114681