diff --git a/server/src/commands/serve.rs b/server/src/commands/serve.rs
index 87e123de..a5605621 100644
--- a/server/src/commands/serve.rs
+++ b/server/src/commands/serve.rs
@@ -1,14 +1,13 @@
 use std::path::{Path, PathBuf};
 use std::process;
 use std::sync::{Arc, Mutex};
-use std::thread;
 
 use rand;
 
 use project::{Project, ProjectLoadError};
 use middleware::{MiddlewareChain};
 use middlewares::{DefaultMiddleware, JsonModelMiddleware, ScriptMiddleware};
-use vfs::{VfsSession, VfsWatcher};
+use vfs::{VfsSession};
 use web;
 
 pub fn serve(project_path: &PathBuf, verbose: bool, port: Option<u64>) {
@@ -88,12 +87,5 @@ pub fn serve(project_path: &PathBuf, verbose: bool, port: Option<u64>) {
 
     println!("Server listening on port {}", web_config.port);
 
-    {
-        let vfs = vfs.clone();
-        thread::spawn(move || {
-            VfsWatcher::new(vfs).start();
-        });
-    }
-
     web::start(web_config, project.clone(), &PLUGIN_CHAIN, vfs.clone());
 }
diff --git a/server/src/vfs/mod.rs b/server/src/vfs/mod.rs
index a19dc4d0..18c44886 100644
--- a/server/src/vfs/mod.rs
+++ b/server/src/vfs/mod.rs
@@ -1,7 +1,5 @@
 mod vfs_session;
 mod vfs_item;
-mod vfs_watcher;
 
 pub use self::vfs_session::*;
 pub use self::vfs_item::*;
-pub use self::vfs_watcher::*;
diff --git a/server/src/vfs/vfs_watcher.rs b/server/src/vfs/vfs_watcher.rs
deleted file mode 100644
index 9ace5262..00000000
--- a/server/src/vfs/vfs_watcher.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-use std::path::PathBuf;
-use std::sync::{mpsc, Arc, Mutex};
-use std::thread;
-use std::time::Duration;
-
-use notify::{DebouncedEvent, RecommendedWatcher, RecursiveMode, Watcher};
-
-use pathext::path_to_route;
-use vfs::VfsSession;
-
-/// An object that registers watchers on the real filesystem and relays those
-/// changes to the virtual filesystem layer.
-pub struct VfsWatcher {
-    vfs: Arc<Mutex<VfsSession>>,
-}
-
-impl VfsWatcher {
-    pub fn new(vfs: Arc<Mutex<VfsSession>>) -> VfsWatcher {
-        VfsWatcher {
-            vfs,
-        }
-    }
-
-    fn start_watcher(
-        vfs: Arc<Mutex<VfsSession>>,
-        rx: mpsc::Receiver<DebouncedEvent>,
-        partition_name: String,
-        root_path: PathBuf,
-    ) {
-        loop {
-            let event = rx.recv().unwrap();
-
-            let mut vfs = vfs.lock().unwrap();
-            let current_time = vfs.current_time();
-
-            match event {
-                DebouncedEvent::Write(ref change_path) |
-                DebouncedEvent::Create(ref change_path) |
-                DebouncedEvent::Remove(ref change_path) => {
-                    if let Some(mut route) = path_to_route(&root_path, change_path) {
-                        route.insert(0, partition_name.clone());
-
-                        vfs.add_change(current_time, route);
-                    } else {
-                        eprintln!("Failed to get route from {}", change_path.display());
-                    }
-                },
-                DebouncedEvent::Rename(ref from_change, ref to_change) => {
-                    if let Some(mut route) = path_to_route(&root_path, from_change) {
-                        route.insert(0, partition_name.clone());
-
-                        vfs.add_change(current_time, route);
-                    } else {
-                        eprintln!("Failed to get route from {}", from_change.display());
-                    }
-
-                    if let Some(mut route) = path_to_route(&root_path, to_change) {
-                        route.insert(0, partition_name.clone());
-
-                        vfs.add_change(current_time, route);
-                    } else {
-                        eprintln!("Failed to get route from {}", to_change.display());
-                    }
-                },
-                _ => {},
-            }
-        }
-    }
-
-    pub fn start(self) {
-        let mut watchers = Vec::new();
-
-        // Create an extra scope so that `vfs` gets dropped and unlocked
-        {
-            let vfs = self.vfs.lock().unwrap();
-
-            for (ref partition_name, ref root_path) in vfs.get_partitions() {
-                let (tx, rx) = mpsc::channel();
-
-                let mut watcher: RecommendedWatcher = Watcher::new(tx, Duration::from_secs(1))
-                    .expect("Unable to create watcher! This is a bug in Rojo.");
-
-                match watcher.watch(&root_path, RecursiveMode::Recursive) {
-                    Ok(_) => (),
-                    Err(_) => {
-                        panic!("Unable to watch partition {}, with path {}! Make sure that it's a file or directory.", partition_name, root_path.display());
-                    },
-                }
-
-                watchers.push(watcher);
-
-                {
-                    let partition_name = partition_name.to_string();
-                    let root_path = root_path.to_path_buf();
-                    let vfs = self.vfs.clone();
-
-                    thread::spawn(move || {
-                        Self::start_watcher(vfs, rx, partition_name, root_path);
-                    });
-                }
-            }
-        }
-
-        loop {
-            thread::park();
-        }
-    }
-}