Reverting 112850 and 112839 due to test failures on some systems

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@112857 91177308-0d34-0410-b5e6-96231b3b80d8
3 files changed