This reverts commit c1cf459cbd79cc7d6ca834390649fb9185a4b237. Reverting to permit time to explore the underlying issue. This change regressed the clang-PPC64-AIX and m68k-linux-cross builders. Differential Revision: https://reviews.llvm.org/D153138 Reviewed By: compnerd