diff --git a/config/warble.rb b/config/warble.rb
index 18fe416..142d14b 100644
--- a/config/warble.rb
+++ b/config/warble.rb
@@ -141,7 +141,7 @@
 
   # Include gem dependencies not mentioned specifically. Default is
   # true, uncomment to turn off.
-  #config.gem_dependencies = false
+  config.gem_dependencies = false
 
   # Array of regular expressions matching relative paths in gems to be
   # excluded from the war. Defaults to empty, but you can set it like
diff --git a/hastur-server.gemspec b/hastur-server.gemspec
index 0de0a91..1f36572 100644
--- a/hastur-server.gemspec
+++ b/hastur-server.gemspec
@@ -61,5 +61,4 @@ EOS
   s.add_runtime_dependency "hastur-rack", "~>0.0.10"
   s.add_runtime_dependency "unicorn" unless RUBY_PLATFORM == "java"
   s.add_runtime_dependency("jruby-astyanax", "~>0.0.4") if RUBY_PLATFORM == "java"
-  s.add_runtime_dependency "jbundler" if RUBY_PLATFORM == "java"  # TODO: remove jbundler
 end