diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 681f1f3a6..55847e1c9 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -364,215 +364,215 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
diff --git a/plugin/pkg/client/auth/gcp/gcp.go b/plugin/pkg/client/auth/gcp/gcp.go
index 3a4f86777..193d0c727 100644
--- a/plugin/pkg/client/auth/gcp/gcp.go
+++ b/plugin/pkg/client/auth/gcp/gcp.go
@@ -18,6 +18,7 @@ package gcp
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -27,7 +28,6 @@ import (
 	"time"
 
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 	"k8s.io/apimachinery/pkg/util/net"
diff --git a/tools/cache/listwatch.go b/tools/cache/listwatch.go
index 06657a3b0..8bf41f517 100644
--- a/tools/cache/listwatch.go
+++ b/tools/cache/listwatch.go
@@ -17,10 +17,9 @@ limitations under the License.
 package cache
 
 import (
+	"context"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
diff --git a/tools/pager/pager.go b/tools/pager/pager.go
index 2e0874e0e..74ea3586a 100644
--- a/tools/pager/pager.go
+++ b/tools/pager/pager.go
@@ -17,10 +17,9 @@ limitations under the License.
 package pager
 
 import (
+	"context"
 	"fmt"
 
-	"golang.org/x/net/context"
-
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
diff --git a/tools/pager/pager_test.go b/tools/pager/pager_test.go
index b905fc1fb..ae517cab2 100644
--- a/tools/pager/pager_test.go
+++ b/tools/pager/pager_test.go
@@ -17,11 +17,11 @@ limitations under the License.
 package pager
 
 import (
+	"context"
 	"fmt"
 	"reflect"
 	"testing"
 
-	"golang.org/x/net/context"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"