Reverted r198807, r198808, as they cause link errors in configure builds. Will look at this later.

git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@198832 91177308-0d34-0410-b5e6-96231b3b80d8