Revert r209488; Greg suggests a different approach.


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