Revert #116331 & #121852#122105

llvm-beanz merged 2 commits intollvm:mainllvm/llvm-project:mainfrom

llvm-beanz:cbieneman/revert-116331llvm-beanz/llvm-project:cbieneman/revert-116331Copy head branch name to clipboard