Revert r194540, it breaks various C++ programs.


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