This reverts commit 1043107ce5e2dee38f6a9bf459549a75f78a83b2. This commit caused a breakage in `finalizing-bufferize.mlir`.