[llvm] Revert #140650 and #140505 (PR #140973)

[Snehasish Kumar via llvm-commits]

snehasish wrote:

### Merge activity

* **May 22, 12:37 AM UTC**: A user started a stack merge that includes this pull request via [Graphite](https://app.graphite.dev/github/pr/llvm/llvm-project/140973).


https://github.com/llvm/llvm-project/pull/140973