Reverting r297821 due to breaking lld test.

llvm-svn: 297838
3 files changed