Revert r190902 and r190906

The first one broke the build, and the latter one made it worse.

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