This reverts commit 75d6b8bb4056d518d06b72e6411ce3749455e2e3. The reasoning is mentioned in https://reviews.llvm.org/D97667