diff --git a/builder/xenserver/step_forward_port_over_ssh.go b/builder/xenserver/step_forward_port_over_ssh.go
index 00e8302..19d6e6b 100644
--- a/builder/xenserver/step_forward_port_over_ssh.go
+++ b/builder/xenserver/step_forward_port_over_ssh.go
@@ -6,7 +6,6 @@ import (
     "log"
     "net"
     "fmt"
-    "time"
 )
 
 type stepForwardPortOverSSH struct {
@@ -68,11 +67,6 @@ func (self *stepForwardPortOverSSH) Run(state multistep.StateBag) multistep.Step
     // Provide the local port to future steps.
     state.Put(self.ResultKey, sshHostPort)
 
-    // Need to wait before connecting
-    // @todo: figure out why and check for the correct conditions.
-    ui.Message("Sleeping 30...")
-    time.Sleep(30 * time.Second)
-
     return multistep.ActionContinue
 }