diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+## 0.4.11.1
+
+* Disable custom timeout code [#116](https://github.com/snoyberg/http-client/issues/116)
+
 ## 0.4.11
 
 * Ignore the 'Content-Length' header if the body contains chunked data [#115](https://github.com/snoyberg/http-client/pull/115)
diff --git a/Network/HTTP/Client/Util.hs b/Network/HTTP/Client/Util.hs
--- a/Network/HTTP/Client/Util.hs
+++ b/Network/HTTP/Client/Util.hs
@@ -27,7 +27,7 @@
 
 import qualified Data.Text as T
 import qualified Data.Text.Read
---import System.Timeout (timeout)
+import System.Timeout (timeout)
 
 import System.Clock
 import System.IO.Unsafe (unsafePerformIO)
@@ -141,6 +141,8 @@
                 | otherwise = spawnWorker man
          in ((hs', isCleaning), action)
 
+-- Disabling the custom timeout code for now. See: https://github.com/snoyberg/http-client/issues/116
+{-
 -- | Has same semantics as @System.Timeout.timeout@, but implemented in such a
 -- way to avoid high-concurrency contention issues. See:
 --
@@ -171,3 +173,4 @@
 data TimeoutTriggered = TimeoutTriggered
     deriving (Show, Typeable)
 instance Exception TimeoutTriggered
+-}
diff --git a/http-client.cabal b/http-client.cabal
--- a/http-client.cabal
+++ b/http-client.cabal
@@ -1,5 +1,5 @@
 name:                http-client
-version:             0.4.11
+version:             0.4.11.1
 synopsis:            An HTTP client engine, intended as a base layer for more user-friendly packages.
 description:         Hackage documentation generation is not reliable. For up to date documentation, please see: <http://www.stackage.org/package/http-client>.
 homepage:            https://github.com/snoyberg/http-client