diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go
index ffaa99d2347..533b5a510db 100644
--- a/pkg/kubectl/cmd/cmd.go
+++ b/pkg/kubectl/cmd/cmd.go
@@ -325,17 +325,9 @@ func (c *clientCache) ClientConfigForVersion(version string) (*client.Config, er
 		}
 	}
 
-	// TODO: remove when SetKubernetesDefaults gets added
-	if len(version) == 0 {
-		version = c.defaultConfig.Version
-	}
-
 	// TODO: have a better config copy method
 	config := *c.defaultConfig
-
-	// TODO: call new client.SetKubernetesDefaults method
-	// instead of doing this
-	config.Version = version
+	client.SetKubernetesDefaults(&config)
 	return &config, nil
 }