diff --git a/Gemfile b/Gemfile
index 15674d021..6e502b3c1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -103,9 +103,10 @@ group :development do
   # dev tools
   gem 'spring',                '~> 1.3.6'
   gem 'spring-commands-rspec', '~> 1.0.4'
-  gem 'spring-watcher-listen',   # otherwise spring polls the filesystem on every 0.2 seconds
-    github: 'jonleighton/spring-watcher-listen',
-    ref: '7f6003e14f8f9ca178a5194f210c07f54cfb67ec'
+  # emits errors, needs more investigation
+  # gem 'spring-watcher-listen',   # otherwise spring polls the filesystem on every 0.2 seconds
+    # github: 'jonleighton/spring-watcher-listen',
+    # ref: '7f6003e14f8f9ca178a5194f210c07f54cfb67ec'
   gem 'guard',                 '~> 2.12.6' # run tests automatically
   gem 'guard-rspec',           '~> 4.5.2'
   gem 'guard-rails',           '~> 0.7.1' # run EPP server automatically
diff --git a/Gemfile.lock b/Gemfile.lock
index 74a409af3..836ecc817 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,15 +24,6 @@ GIT
       hpricot
       libxml-ruby
 
-GIT
-  remote: https://github.com/jonleighton/spring-watcher-listen.git
-  revision: 7f6003e14f8f9ca178a5194f210c07f54cfb67ec
-  ref: 7f6003e14f8f9ca178a5194f210c07f54cfb67ec
-  specs:
-    spring-watcher-listen (1.0.0)
-      listen (~> 2.7)
-      spring (~> 1.2)
-
 GIT
   remote: https://github.com/rubysec/bundler-audit.git
   revision: f89ef7fae1090bbad825ea76812d56d72b417055
@@ -625,7 +616,6 @@ DEPENDENCIES
   simpleidn (~> 0.0.5)
   spring (~> 1.3.6)
   spring-commands-rspec (~> 1.0.4)
-  spring-watcher-listen!
   therubyracer (~> 0.12.2)
   traceroute (~> 0.5.0)
   turbolinks (~> 2.5.3)