diff --git a/builder/cloudstack/ssh.go b/builder/cloudstack/ssh.go
index 518747ceb..269c2a583 100644
--- a/builder/cloudstack/ssh.go
+++ b/builder/cloudstack/ssh.go
@@ -2,7 +2,6 @@ package cloudstack
 
 import (
 	"fmt"
-	"log"
 
 	"github.com/hashicorp/packer/helper/multistep"
 )
diff --git a/builder/oracle/classic/builder.go b/builder/oracle/classic/builder.go
index d8e169146..d97b3be10 100644
--- a/builder/oracle/classic/builder.go
+++ b/builder/oracle/classic/builder.go
@@ -99,7 +99,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			},
 			&communicator.StepConnect{
 				Config:    &b.config.Comm,
-				Host:      ocommon.CommHost(b.config.Comm.SSHHost),
+				Host:      communicator.CommHost(b.config.Comm.SSHHost, "instance_ip"),
 				SSHConfig: b.config.Comm.SSHConfigFunc(),
 			},
 			&common.StepProvision{},
@@ -162,7 +162,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			&stepCreateInstance{},
 			&communicator.StepConnect{
 				Config:    &b.config.Comm,
-				Host:      ocommon.CommHost(b.config.Comm.SSHHost),
+				Host:      communicator.CommHost(b.config.Comm.SSHHost, "instance_ip"),
 				SSHConfig: b.config.Comm.SSHConfigFunc(),
 			},
 			&common.StepProvision{},
diff --git a/helper/communicator/comm_host.go b/helper/communicator/comm_host.go
index b2ffde9d3..adc49b257 100644
--- a/helper/communicator/comm_host.go
+++ b/helper/communicator/comm_host.go
@@ -1,6 +1,7 @@
 package communicator
 
 import (
+	"fmt"
 	"log"
 
 	"github.com/hashicorp/packer/helper/multistep"