diff --git a/Gemfile b/Gemfile
index 23eeb8e4..63da8400 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,6 @@ gem 'yard-sinatra',    github: 'rkh/yard-sinatra'
 gem 'rack-contrib',    github: 'rack/rack-contrib'
 gem 'rack-cache',      '~> 1.2'
 gem 'rack-attack'
-gem 'rack-timeout',    github: 'kch/rack-timeout'
 gem 'gh'
 gem 'bunny'
 gem 'dalli'
diff --git a/Gemfile.lock b/Gemfile.lock
index b197a797..1762a8fa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,12 +8,6 @@ GIT
       multi_json (~> 1.0)
       uuidtools
 
-GIT
-  remote: git://github.com/kch/rack-timeout.git
-  revision: 83ca9f5141c1fdcb626820b1601c406e3a3a560a
-  specs:
-    rack-timeout (0.1.0beta2)
-
 GIT
   remote: git://github.com/rack/rack-contrib.git
   revision: 951760b1710634623ebbccef8d65df9139bb41c2
@@ -299,7 +293,6 @@ DEPENDENCIES
   rack-attack
   rack-cache (~> 1.2)
   rack-contrib!
-  rack-timeout!
   rake (~> 0.9.2)
   rb-fsevent (~> 0.9.1)
   rerun
diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb
index 4974f595..fb4ac081 100644
--- a/lib/travis/api/app.rb
+++ b/lib/travis/api/app.rb
@@ -5,7 +5,6 @@ require 'rack/protection'
 require 'rack/contrib'
 require 'rack/cache'
 require 'rack/attack'
-require 'rack-timeout'
 require 'active_record'
 require 'redis'
 require 'gh'
@@ -65,9 +64,6 @@ module Travis::Api
 
     def initialize
       @app = Rack::Builder.app do
-        Rack::Timeout.timeout = 10
-        use Rack::Timeout
-
         Rack::Utils::HTTP_STATUS_CODES[420] = "Enhance Your Calm"
         use Rack::Attack
         Rack::Attack.blacklist('block client requesting ruby builds') do |req|