Revert r181703 as it is out of step with the llvm/release_33 branch.
Revert r181387 to fix the build, as lldb is out of step with the llvm/release_33 branch.