1 files changed, 9 insertions, 10 deletions
diff --git a/pkg/domain/infra/runtime_abi.go b/pkg/domain/infra/runtime_abi.go
index de996f567..31f832423 100644
--- a/pkg/domain/infra/runtime_abi.go
+++ b/pkg/domain/infra/runtime_abi.go
@@ -8,32 +8,31 @@ import (
 
 	"github.com/containers/libpod/pkg/bindings"
 	"github.com/containers/libpod/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/domain/infra/abi"
 	"github.com/containers/libpod/pkg/domain/infra/tunnel"
 )
 
 // NewContainerEngine factory provides a libpod runtime for container-related operations
-func NewContainerEngine(mode entities.EngineMode, opts entities.EngineOptions) (entities.ContainerEngine, error) {
-	switch mode {
+func NewContainerEngine(opts entities.EngineOptions) (entities.ContainerEngine, error) {
+	switch opts.EngineMode {
 	case entities.ABIMode:
 		r, err := NewLibpodRuntime(opts.FlagSet, opts.Flags)
-		return &abi.ContainerEngine{ContainerEngine: r}, err
+		return r, err
 	case entities.TunnelMode:
-		ctx, err := bindings.NewConnection(context.Background(), opts.Uri.String(), opts.Identities...)
+		ctx, err := bindings.NewConnection(context.Background(), opts.Uri, opts.Identities...)
 		return &tunnel.ContainerEngine{ClientCxt: ctx}, err
 	}
-	return nil, fmt.Errorf("runtime mode '%v' is not supported", mode)
+	return nil, fmt.Errorf("runtime mode '%v' is not supported", opts.EngineMode)
 }
 
 // NewContainerEngine factory provides a libpod runtime for image-related operations
-func NewImageEngine(mode entities.EngineMode, opts entities.EngineOptions) (entities.ImageEngine, error) {
-	switch mode {
+func NewImageEngine(opts entities.EngineOptions) (entities.ImageEngine, error) {
+	switch opts.EngineMode {
 	case entities.ABIMode:
 		r, err := NewLibpodImageRuntime(opts.FlagSet, opts.Flags)
 		return r, err
 	case entities.TunnelMode:
-		ctx, err := bindings.NewConnection(context.Background(), opts.Uri.String(), opts.Identities...)
+		ctx, err := bindings.NewConnection(context.Background(), opts.Uri, opts.Identities...)
 		return &tunnel.ImageEngine{ClientCxt: ctx}, err
 	}
-	return nil, fmt.Errorf("runtime mode '%v' is not supported", mode)
+	return nil, fmt.Errorf("runtime mode '%v' is not supported", opts.EngineMode)
 }