https://github.com/lukel97 approved this pull request. LGTM, thanks. I think the PR number in the title/description should be #149461, since you're reapplying the original PR not the revert https://github.com/llvm/llvm-project/pull/153703