This reverts commit 9c01eaff. The changes in this commit are causing several of the LLDB tests to hang and/or timeout. llvm-svn: 365371