diff --git a/lib/fog/rackspace/models/compute_v2/servers.rb b/lib/fog/rackspace/models/compute_v2/servers.rb
index e567b0ae9..695f54159 100644
--- a/lib/fog/rackspace/models/compute_v2/servers.rb
+++ b/lib/fog/rackspace/models/compute_v2/servers.rb
@@ -41,7 +41,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::InvalidServerStateException] if server state is an error state
         def bootstrap(new_attributes = {})
           server = create(new_attributes)
-          server.wait_for(1500) { ready? && !public_ip_address.empty? }
+          server.wait_for { ready? && !public_ip_address.empty? }
           server.setup(:password => server.password)
           server
         end