diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEDistributeL1Allocations.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEDistributeL1Allocations.cpp
index 0af3e8b32..08783c86f 100644
--- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEDistributeL1Allocations.cpp
+++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEDistributeL1Allocations.cpp
@@ -56,17 +56,17 @@ MemRefType getDistributedType(memref::AllocOp alloc,
       // Check that all offsets are either constants or thread ids. We assume
       // that if a subview has an offset which is not a constant and not a
       // thread id, it's not 'distributing'.
-      Operation::operand_range offsets = subview.getOffsets();
-      int nIndVars{0};
-      for (Value offset : offsets) {
-        bool isConst = matchPattern(offset, m_Constant());
-        bool isIndVar = llvm::is_contained(indVars, offset);
-        nIndVars += isIndVar;
-        if (!isConst && !isIndVar) return {};
-      }
-
-      // If there are no thread ids, this subview is not distributing.
-      if (nIndVars == 0) return {};
+//      Operation::operand_range offsets = subview.getOffsets();
+//      int nIndVars{0};
+//      for (Value offset : offsets) {
+//        bool isConst = matchPattern(offset, m_Constant());
+//        bool isIndVar = llvm::is_contained(indVars, offset);
+//        nIndVars += isIndVar;
+//        if (!isConst && !isIndVar) return {};
+//      }
+//
+//      // If there are no thread ids, this subview is not distributing.
+//      if (nIndVars == 0) return {};
 
       auto nextType = cast<MemRefType>(subview.getResult().getType());
       if (!type) {
diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.cpp
index 414050d91..9748cd723 100644
--- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.cpp
+++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.cpp
@@ -68,7 +68,7 @@ static LogicalResult aieComprehensiveBufferizeCopyFn(OpBuilder &builder,
   // post-bufferization copies do not trigger properly.
   // So we keep using `createLinalgCopyOp` which builds a GenericOp.
   // builder.create<linalg::CopyOp>(loc, from, to);
-  // mlir::iree_compiler::createLinalgCopyOp(builder, loc, from, to);
+  mlir::iree_compiler::createLinalgCopyOp(builder, loc, from, to);
   return success();
 }
 
@@ -182,14 +182,14 @@ void addPackPeelBasedPassPipeline(OpPassManager &funcPassManager,
   funcPassManager.addPass(createCanonicalizerPass());
   funcPassManager.addPass(createCSEPass());
 
-  // Promote the matmul output to local memory
-  {
-    AMDAIEBufferizeToAllocationOptions bufferizeOptions;
-    bufferizeOptions.memorySpace = 2;
-    bufferizeOptions.bufferizeOperand = BufferizeOperand::Output;
-    funcPassManager.addPass(
-        createAMDAIEBufferizeToAllocationPass(bufferizeOptions));
-  }
+//  // Promote the matmul output to local memory
+//  {
+//    AMDAIEBufferizeToAllocationOptions bufferizeOptions;
+//    bufferizeOptions.memorySpace = 2;
+//    bufferizeOptions.bufferizeOperand = BufferizeOperand::Output;
+//    funcPassManager.addPass(
+//        createAMDAIEBufferizeToAllocationPass(bufferizeOptions));
+//  }
 
   {
     AMDAIETileAndFuseOptions tileFuseOptions;