diff --git a/cmd/helm/helm_test.go b/cmd/helm/helm_test.go
index 16963e877..b3024a01c 100644
--- a/cmd/helm/helm_test.go
+++ b/cmd/helm/helm_test.go
@@ -116,7 +116,6 @@ func executeActionCommandStdinC(store *storage.Storage, in *os.File, cmd string)
 			return fake
 		},
 		Releases:     store,
-		KubeClient:   nil,
 		Capabilities: chartutil.DefaultCapabilities,
 		Log:          func(format string, v ...interface{}) {},
 	}
diff --git a/pkg/action/action.go b/pkg/action/action.go
index a688c73f9..3217ca502 100644
--- a/pkg/action/action.go
+++ b/pkg/action/action.go
@@ -424,7 +424,6 @@ func (c *Configuration) Init(getter genericclioptions.RESTClientGetter, namespac
 		client.Namespace = namespace
 		return client
 	}
-	c.KubeClient = nil
 	c.Releases = store
 	c.Log = log
 
diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go
index d4fed924e..6da57238e 100644
--- a/pkg/action/install_test.go
+++ b/pkg/action/install_test.go
@@ -299,7 +299,6 @@ func TestInstallRelease_FailedHooks(t *testing.T) {
 	instAction.ReleaseName = "failed-hooks"
 	failer := instAction.cfg.GetKubeClient("").(*kubefake.FailingKubeClient)
 	failer.WatchUntilReadyError = fmt.Errorf("Failed watch")
-	// instAction.cfg.KubeClient = failer
 
 	vals := map[string]interface{}{}
 	res, err := instAction.Run(buildChart(), vals)
@@ -352,7 +351,6 @@ func TestInstallRelease_Wait(t *testing.T) {
 	instAction.ReleaseName = "come-fail-away"
 	failer := instAction.cfg.GetKubeClient("").(*kubefake.FailingKubeClient)
 	failer.WaitError = fmt.Errorf("I timed out")
-	// instAction.cfg.KubeClient = failer
 	instAction.Wait = true
 	vals := map[string]interface{}{}
 
@@ -370,7 +368,6 @@ func TestInstallRelease_Atomic(t *testing.T) {
 		instAction.ReleaseName = "come-fail-away"
 		failer := instAction.cfg.GetKubeClient("").(*kubefake.FailingKubeClient)
 		failer.WaitError = fmt.Errorf("I timed out")
-		// instAction.cfg.KubeClient = failer
 		instAction.Atomic = true
 		vals := map[string]interface{}{}
 
@@ -391,7 +388,6 @@ func TestInstallRelease_Atomic(t *testing.T) {
 		failer := instAction.cfg.GetKubeClient("").(*kubefake.FailingKubeClient)
 		failer.WaitError = fmt.Errorf("I timed out")
 		failer.DeleteError = fmt.Errorf("uninstall fail")
-		// instAction.cfg.KubeClient = failer
 		instAction.Atomic = true
 		vals := map[string]interface{}{}
 
diff --git a/pkg/action/upgrade_test.go b/pkg/action/upgrade_test.go
index 741d16e40..d89d53bb9 100644
--- a/pkg/action/upgrade_test.go
+++ b/pkg/action/upgrade_test.go
@@ -50,7 +50,6 @@ func TestUpgradeRelease_Wait(t *testing.T) {
 
 	failer := upAction.cfg.GetKubeClient("").(*kubefake.FailingKubeClient)
 	failer.WaitError = fmt.Errorf("I timed out")
-	// upAction.cfg.KubeClient = failer
 	upAction.Wait = true
 	vals := map[string]interface{}{}
 
@@ -73,7 +72,6 @@ func TestUpgradeRelease_CleanupOnFail(t *testing.T) {
 	failer := upAction.cfg.GetKubeClient("").(*kubefake.FailingKubeClient)
 	failer.WaitError = fmt.Errorf("I timed out")
 	failer.DeleteError = fmt.Errorf("I tried to delete nil")
-	// upAction.cfg.KubeClient = failer
 	upAction.Wait = true
 	upAction.CleanupOnFail = true
 	vals := map[string]interface{}{}
@@ -100,7 +98,6 @@ func TestUpgradeRelease_Atomic(t *testing.T) {
 		failer := upAction.cfg.GetKubeClient("").(*kubefake.FailingKubeClient)
 		// We can't make Update error because then the rollback won't work
 		failer.WatchUntilReadyError = fmt.Errorf("arming key removed")
-		// upAction.cfg.KubeClient = failer
 		upAction.Atomic = true
 		vals := map[string]interface{}{}
 
@@ -125,7 +122,6 @@ func TestUpgradeRelease_Atomic(t *testing.T) {
 
 		failer := upAction.cfg.GetKubeClient("").(*kubefake.FailingKubeClient)
 		failer.UpdateError = fmt.Errorf("update fail")
-		// upAction.cfg.KubeClient = failer
 		upAction.Atomic = true
 		vals := map[string]interface{}{}