This reverts commit 183d6af081. Revert pending further consensus building: https://reviews.llvm.org/D79963#2050521
183d6af081