diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 610b4166..540474e2 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -396,207 +396,207 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
diff --git a/rest/fake/fake.go b/rest/fake/fake.go
index bc43a90a..bbba2da3 100644
--- a/rest/fake/fake.go
+++ b/rest/fake/fake.go
@@ -94,14 +94,10 @@ func (c *RESTClient) request(verb string) *restclient.Request {
 
 	ns := c.NegotiatedSerializer
 	info, _ := runtime.SerializerInfoForMediaType(ns.SupportedMediaTypes(), runtime.ContentTypeJSON)
-	internalVersion := schema.GroupVersion{
-		Group:   c.GroupVersion.Group,
-		Version: runtime.APIVersionInternal,
-	}
 	serializers := restclient.Serializers{
 		// TODO this was hardcoded before, but it doesn't look right
 		Encoder: ns.EncoderForVersion(info.Serializer, c.GroupVersion),
-		Decoder: ns.DecoderToVersion(info.Serializer, internalVersion),
+		Decoder: ns.DecoderToVersion(info.Serializer, c.GroupVersion),
 	}
 	if info.StreamSerializer != nil {
 		serializers.StreamingSerializer = info.StreamSerializer.Serializer