Roll back my change to r198729; I'm going to revert it entirely.


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