This will mitigate a potential perf regression from the last release as discussed here: https://reviews.llvm.org/D113442 /cherry-pick 6592bcecd4