This reverts commit bec488b8. This commit introduced a layering violation between MLIR libraries. Reverting for now while discussing on the original review thread.