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