Also revert 4697e701, restoring the original patch from https://reviews.llvm.org/D72751
mentioned in commit 40efa65d