diff --git a/CHANGELOG.md b/CHANGELOG.md
index 384b1220dbc..ed5be3e20a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.1.1 (unreleased)
+
+**Fixes**
+- [Issue #2443](https://github.com/grafana/grafana/issues/2443). Templating: Fix for buggy repeat row behavior when combined with with repeat panel due to recent change before 2.1 release
+
 # 2.1.0 (2015-08-04)
 
 **Data sources**
diff --git a/public/app/features/dashboard/dynamicDashboardSrv.js b/public/app/features/dashboard/dynamicDashboardSrv.js
index c4433f75c89..8e3c24f7202 100644
--- a/public/app/features/dashboard/dynamicDashboardSrv.js
+++ b/public/app/features/dashboard/dynamicDashboardSrv.js
@@ -53,10 +53,6 @@ function (angular, _) {
             row.panels = _.without(row.panels, panel);
             j = j - 1;
           }
-          // clean up left over scoped vars
-          else if (panel.scopedVars && panel.repeatIteration !== this.iteration) {
-            delete panel.scopedVars;
-          }
         }
       }
     };
@@ -120,7 +116,6 @@ function (angular, _) {
           panel = copy.panels[i];
           panel.scopedVars = {};
           panel.scopedVars[variable.name] = option;
-          panel.repeatIteration = self.iteration;
         }
       });
     };