Try to revert D113741 once again. This also reverts0ac75e82ff(D114705) as it causes LLDB's lldb-api.lang/cpp/nsimport.TestCppNsImport.py test failure w/o D113741. This reverts commitf9607d45f3. Differential Revision: https://reviews.llvm.org/D116225