diff --git a/xla/service/gpu/fusions/transforms/tests/simplify_arith.mlir b/xla/service/gpu/fusions/transforms/tests/simplify_arith.mlir
index a9ea3e5e7c76b7..5f776d0f338862 100644
--- a/xla/service/gpu/fusions/transforms/tests/simplify_arith.mlir
+++ b/xla/service/gpu/fusions/transforms/tests/simplify_arith.mlir
@@ -1,5 +1,5 @@
-// RUN: mlir_fusions_opt %s -split-input-file -xla-gpu-simplify-arith -cse -canonicalize  --mlir-print-ir-after-all
-//| FileCheck %s
+// RUN: mlir_fusions_opt %s -split-input-file -xla-gpu-simplify-arith -cse \
+// RUN:   -canonicalize | FileCheck %s
 
 module {
   func.func @unknown(%arg0: index {xla.range = [0 : index, 42 : index]}) -> i1 {
diff --git a/xla/service/gpu/model/indexing_map.cc b/xla/service/gpu/model/indexing_map.cc
index a004ab92c8d4ad..7add913b3e5942 100644
--- a/xla/service/gpu/model/indexing_map.cc
+++ b/xla/service/gpu/model/indexing_map.cc
@@ -2172,10 +2172,8 @@ IndexingMap IndexingMap::ConvertSymbolsToDimensions() const {
   AffineMap canonical_map =
       affine_map_.replaceDimsAndSymbols({}, syms_replacements, num_vars, 0);
   IndexingMap new_indexing_map(canonical_map, new_dim_vars, /*range_vars=*/{},
-                               /*rt_vars=*/{}, new_constraints, is_simplified_);
-  if (is_simplified_) {
-    new_indexing_map.Simplify();
-  }
+                               /*rt_vars=*/{}, new_constraints,
+                               /*is_simplified=*/false);
   return new_indexing_map;
 }