Reverting r204968 and r204969; while more build bots are happy with the results, some still have link errors.

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