Revert r181482 as it causes occasional hangs in LLDB buildbots