This reverts commit 5890b30105 as per discussion on the review thread: https://reviews.llvm.org/D114487#3547560.
5890b30105