nickdesaulniers wrote: It's ok, we'll get it cleaned up. Does that plan I outlined above seem agreeable? Do you @SchrodingerZhu want to send a PR with the reverts or shall I? https://github.com/llvm/llvm-project/pull/74166