Revert r197438 and r197447 until we figure out how to avoid circular dependency at link time

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