Revert r219102 as it caused significant buildbot breakage



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