This reverts commit 3875804a. This caused some test failures for the MLIR python bindings. Reverting until those are addressed.