This reverts commit r247730, effectively reapplying r247729. This time I have an lld commit ready to follow. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@247735 91177308-0d34-0410-b5e6-96231b3b80d8