This reverts commit 95ddc8341ae2c27229ad3dcf1d55abebcec15d02. Differential Revision: https://reviews.llvm.org/D108396