Remove stray parts of (reverted on trunk) r196205 that are causing test
failures.


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