Revert r210721 as it causes breakage in internal builds (and possibly GDB).


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