diff --git a/src/server/index.coffee b/src/server/index.coffee
index 7f8340b218..0a64cd3e37 100644
--- a/src/server/index.coffee
+++ b/src/server/index.coffee
@@ -14,8 +14,8 @@ toobusy = require 'toobusy'
 
 racer = require 'racer'
 racer.io.set('transports', ['xhr-polling'])
-#racer.set('bundleTimeout', 20000)
-if true #unless process.env.NODE_ENV == 'production'
+racer.set('bundleTimeout', 6000)
+unless process.env.NODE_ENV == 'production'
   racer.use(racer.logPlugin)
   derby.use(derby.logPlugin)