diff --git a/externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorBase.td b/externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorBase.td
index 4c842db6d..9a641bcba 100644
--- a/externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorBase.td
+++ b/externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorBase.td
@@ -43,7 +43,6 @@ def TMTensor_Dialect : Dialect {
     to.
   }];
   let hasCanonicalizer = 1;
-  let useFoldAPI = kEmitFoldAdaptorFolder;
 }
 
 //===----------------------------------------------------------------------===//
diff --git a/externals/llvm-project b/externals/llvm-project
index 5e111eb27..b5bf6f639 160000
--- a/externals/llvm-project
+++ b/externals/llvm-project
@@ -1 +1 @@
-Subproject commit 5e111eb275eee3bec1123b4b85606328017e5ee5
+Subproject commit b5bf6f6392a3408be1b7b7e036eb69358c5a2c29
diff --git a/externals/mlir-hlo b/externals/mlir-hlo
index a99159c45..bb1ed5b47 160000
--- a/externals/mlir-hlo
+++ b/externals/mlir-hlo
@@ -1 +1 @@
-Subproject commit a99159c45ee5c497f8dce01eff807a6d57629b61
+Subproject commit bb1ed5b47c036993b954e881cce7c7aab00f9962
diff --git a/include/torch-mlir/Dialect/Torch/IR/TorchBase.td b/include/torch-mlir/Dialect/Torch/IR/TorchBase.td
index 3110c612c..14fe0e661 100644
--- a/include/torch-mlir/Dialect/Torch/IR/TorchBase.td
+++ b/include/torch-mlir/Dialect/Torch/IR/TorchBase.td
@@ -37,7 +37,6 @@ def Torch_Dialect : Dialect {
   let hasRegionArgAttrVerify = 1;
   let hasConstantMaterializer = 1;
   let useDefaultTypePrinterParser = 0;
-  let useFoldAPI = kEmitFoldAdaptorFolder;
 
   let extraClassDeclaration = [{
     /// Parse a type registered to this dialect.
diff --git a/include/torch-mlir/Dialect/TorchConversion/IR/TorchConversionBase.td b/include/torch-mlir/Dialect/TorchConversion/IR/TorchConversionBase.td
index 2fc7fc45e..fadeb5c8c 100644
--- a/include/torch-mlir/Dialect/TorchConversion/IR/TorchConversionBase.td
+++ b/include/torch-mlir/Dialect/TorchConversion/IR/TorchConversionBase.td
@@ -27,7 +27,6 @@ def TorchConversion_Dialect : Dialect {
   }];
 
   let hasConstantMaterializer = 1;
-  let useFoldAPI = kEmitFoldAdaptorFolder;
 }
 
 #endif // TORCHCONVERSION_BASE