diff --git a/cli/command/context/options.go b/cli/command/context/options.go
index 977926397469..eb0df92c4251 100644
--- a/cli/command/context/options.go
+++ b/cli/command/context/options.go
@@ -13,7 +13,6 @@ import (
 	"github.com/docker/cli/cli/context/kubernetes"
 	"github.com/docker/cli/cli/context/store"
 	"github.com/docker/docker/client"
-	"github.com/docker/docker/pkg/homedir"
 	"github.com/pkg/errors"
 )
 
@@ -189,7 +188,9 @@ func getKubernetesEndpoint(dockerCli command.Cli, config map[string]string) (*ku
 		// fallback to env-based kubeconfig
 		kubeconfig := os.Getenv("KUBECONFIG")
 		if kubeconfig == "" {
-			kubeconfig = filepath.Join(homedir.Get(), ".kube/config")
+			// Error is deliberately unhandled to mimic old behavior.
+			homeDir, _ := os.UserHomeDir()
+			kubeconfig = filepath.Join(homeDir, ".kube/config")
 		}
 		ep, err := kubernetes.FromKubeConfig(kubeconfig, "", "")
 		if err != nil {
diff --git a/cli/config/config.go b/cli/config/config.go
index c860cf7125f0..526fa4d202e7 100644
--- a/cli/config/config.go
+++ b/cli/config/config.go
@@ -10,7 +10,6 @@ import (
 	"github.com/docker/cli/cli/config/configfile"
 	"github.com/docker/cli/cli/config/credentials"
 	"github.com/docker/cli/cli/config/types"
-	"github.com/docker/docker/pkg/homedir"
 	"github.com/pkg/errors"
 )
 
@@ -27,8 +26,10 @@ var (
 )
 
 func init() {
+	// Error is deliberately unhandled to mimic old behavior.
+	homeDir, _ := os.UserHomeDir()
 	if configDir == "" {
-		configDir = filepath.Join(homedir.Get(), configFileDir)
+		configDir = filepath.Join(homeDir, configFileDir)
 	}
 }
 
diff --git a/cli/context/kubernetes/load.go b/cli/context/kubernetes/load.go
index 113ec1ad78a5..5a5f16a58776 100644
--- a/cli/context/kubernetes/load.go
+++ b/cli/context/kubernetes/load.go
@@ -8,7 +8,6 @@ import (
 	"github.com/docker/cli/cli/context"
 	"github.com/docker/cli/cli/context/store"
 	api "github.com/docker/compose-on-kubernetes/api"
-	"github.com/docker/docker/pkg/homedir"
 	"github.com/pkg/errors"
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
@@ -80,7 +79,9 @@ func (c *Endpoint) KubernetesConfig() clientcmd.ClientConfig {
 func (c *EndpointMeta) ResolveDefault(stackOrchestrator command.Orchestrator) (interface{}, *store.EndpointTLSData, error) {
 	kubeconfig := os.Getenv("KUBECONFIG")
 	if kubeconfig == "" {
-		kubeconfig = filepath.Join(homedir.Get(), ".kube/config")
+		// Error is deliberately unhandled to mimic old behavior.
+		homeDir, _ := os.UserHomeDir()
+		kubeconfig = filepath.Join(homeDir, ".kube/config")
 	}
 	kubeEP, err := FromKubeConfig(kubeconfig, "", "")
 	if err != nil {