This reverts commit 137ff733. This belongs in Apple's Swift fork since this is a direct fix for unified Swift + llvm + lldb builds.