diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index 33c613180..87311016e 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -3,6 +3,7 @@
 /*
   Part of the Processing project - http://processing.org
 
+  Copyright (c) 2012-14 The Processing Foundation
   Copyright (c) 2004-12 Ben Fry and Casey Reas
   Copyright (c) 2001-04 Massachusetts Institute of Technology
 
@@ -2586,16 +2587,16 @@ public abstract class Editor extends JFrame implements RunnerListener {
     statusNotice(Language.text("editor.status.saving"));
     try {
       if (sketch.saveAs()) {
-        //a saveAs moves where the files are, so a listener must be attached to the new location
-        initFileChangeListener();
+        // Disabling for 3.0a4
+        if (false && Preferences.getBoolean("editor.watcher")) {  
+          // "Save As" moves where the files are, so a listener must be 
+          // attached to the new location.
+          // TODO shouldn't this remove the old listener?
+          initFileChangeListener();
+        }
         // statusNotice("Done Saving.");
-    	// status is now printed from Sketch so that "Done Saving."
-    	// is only printed after Save As when progress bar is shown.  
-    	  
-        // Disabling this for 0125, instead rebuild the menu inside
-        // the Save As method of the Sketch object, since that's the
-        // only one who knows whether something was renamed.
-        //sketchbook.rebuildMenusAsync();
+        // status is now printed from Sketch so that "Done Saving."
+        // is only printed after Save As when progress bar is shown. 
       } else {
         statusNotice(Language.text("editor.status.saving.canceled"));
         return false;
diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index d6700b8fa..90c5036bf 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -17,6 +17,9 @@ until all those issues are sorted out.
 + The OS X default File menu (shown when no windows are open) now has the
   order/naming changes found in the sketch window File menu. 
 
++ Turning off file watching because of errant "this sketch has changed"
+  messages. Hopefully this will return soon.
+  https://github.com/processing/processing/issues/2852
 
 [ bug fixes ]