diff --git a/lib/mongo/util/tcp_socket.rb b/lib/mongo/util/tcp_socket.rb
index 9c3e4d0..2806ee8 100644
--- a/lib/mongo/util/tcp_socket.rb
+++ b/lib/mongo/util/tcp_socket.rb
@@ -69,9 +69,9 @@ module Mongo
       end
       if ready
         begin
-          @socket.readpartial(maxlen, buffer)
-        rescue EOFError
-          return ConnectionError
+          @socket.read(maxlen, buffer)
+        rescue EOFError, Errno::ETIMEDOUT
+          raise ConnectionError
         rescue Errno::ENOTCONN, Errno::EBADF, Errno::ECONNRESET, Errno::EPIPE
           raise ConnectionFailure
         rescue Errno::EINTR, Errno::EIO, IOError