diff --git a/src/filesystem/FileSystem.js b/src/filesystem/FileSystem.js
index fa7b4400ac1..20bb7afe272 100644
--- a/src/filesystem/FileSystem.js
+++ b/src/filesystem/FileSystem.js
@@ -463,8 +463,9 @@ define(function (require, exports, module) {
         this._index.clear();
         
         // Initialize watchers
-        this._impl.unwatchAll();
-        this._impl.initWatchers(this._watcherCallback.bind(this));
+        // FIXME: reenable once server-side watchers are more stable
+//        this._impl.unwatchAll();
+//        this._impl.initWatchers(this._watcherCallback.bind(this));
         
         // Start indexing from the new root path
         this._scanDirectory(rootPath);