diff --git a/public/app/features/dashboard/unsavedChangesSrv.js b/public/app/features/dashboard/unsavedChangesSrv.js
index 15eb465e333..d17276dc374 100644
--- a/public/app/features/dashboard/unsavedChangesSrv.js
+++ b/public/app/features/dashboard/unsavedChangesSrv.js
@@ -20,13 +20,13 @@ function(angular, _, config) {
     $rootScope.$on("dashboard-loaded", function(event, newDashboard) {
       // wait for different services to patch the dashboard (missing properties)
       $timeout(function() {
-        self.original = angular.copy(newDashboard);
+        self.original = newDashboard.getSaveModelClone();
         self.current = newDashboard;
       }, 1200);
     });
 
     $rootScope.$on("dashboard-saved", function(event, savedDashboard) {
-      self.original = angular.copy(savedDashboard);
+      self.original = savedDashboard.getSaveModelClone();
       self.current = savedDashboard;
       self.orignalPath = $location.path();
     });
@@ -85,7 +85,7 @@ function(angular, _, config) {
         return false;
       }
 
-      var current = angular.copy(self.current);
+      var current = self.current.getSaveModelClone();
       var original = self.original;
 
       // ignore timespan changes
diff --git a/public/app/plugins/datasource/sql/plugin.json b/public/app/plugins/datasource/sql/plugin.json_
similarity index 100%
rename from public/app/plugins/datasource/sql/plugin.json
rename to public/app/plugins/datasource/sql/plugin.json_