[llvm] [mlir] Revert #95218 and #94953 (PR #95244)

[Kunwar Grover via llvm-commits]

https://github.com/Groverkss approved this pull request.

LGTM, reverting since release build is broken seems fair to me.

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