Reverting PR #184065 and #200323 to address some interplay with CFI#201194

mtrofin merged 3 commits into

llvm:mainllvm/llvm-project:mainfrom

mtrofin:revertmtrofin/llvm-project:revertCopy head branch name to clipboard