diff --git a/mlir/lib/IR/AffineExpr.cpp b/mlir/lib/IR/AffineExpr.cpp
--- a/mlir/lib/IR/AffineExpr.cpp
+++ b/mlir/lib/IR/AffineExpr.cpp
@@ -1399,13 +1399,11 @@
                                         flattener.localExprs,
                                         expr.getContext()))
     return expr;
+  // TODO: Use getSemiAffineExprFromFlatForm method after the bug is being
+  // fixed.
   AffineExpr simplifiedExpr =
-      expr.isPureAffine()
-          ? getAffineExprFromFlatForm(flattenedExpr, numDims, numSymbols,
-                                      flattener.localExprs, expr.getContext())
-          : getSemiAffineExprFromFlatForm(flattenedExpr, numDims, numSymbols,
-                                          flattener.localExprs,
-                                          expr.getContext());
+      getAffineExprFromFlatForm(flattenedExpr, numDims, numSymbols,
+                                flattener.localExprs, expr.getContext());
 
   flattener.operandExprStack.pop_back();
   assert(flattener.operandExprStack.empty());