diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 2c2f1aab..ea6d3614 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -252,331 +252,331 @@
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta2",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1beta1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1beta1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v2beta1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1beta1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v2alpha1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/certificates/v1beta1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/core/v1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/events/v1beta1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/extensions/v1beta1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/networking/v1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/policy/v1beta1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1alpha1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1beta1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/scheduling/v1alpha1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/settings/v1alpha1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1alpha1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1beta1",
-			"Rev": "b39a8bdff32033fd1f645f17f1625f3b691124b6"
+			"Rev": "e8df68e6b4a0eb60c21b9ba3a0b3e049bc041a31"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "6ad68b3c504c71a07c48328779d8b5aabe2e4dd9"
+			"Rev": "83d7ef28e0fad5ab58a504754c1def10404d297d"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
diff --git a/dynamic/simple.go b/dynamic/simple.go
index 350a2865..41e0360e 100644
--- a/dynamic/simple.go
+++ b/dynamic/simple.go
@@ -158,8 +158,17 @@ func (c *dynamicResourceClient) UpdateStatus(obj *unstructured.Unstructured) (*u
 		return nil, err
 	}
 
-	result := c.client.client.Put().AbsPath(append(c.makeURLSegments(accessor.GetName()), "status")...).Body(obj).Do()
-	uncastObj, err := result.Get()
+	outBytes, err := runtime.Encode(unstructured.UnstructuredJSONScheme, obj)
+	if err != nil {
+		return nil, err
+	}
+
+	result := c.client.client.Put().AbsPath(append(c.makeURLSegments(accessor.GetName()), "status")...).Body(outBytes).Do()
+	retBytes, err := result.Raw()
+	if err != nil {
+		return nil, err
+	}
+	uncastObj, err := runtime.Decode(unstructured.UnstructuredJSONScheme, retBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -167,9 +176,6 @@ func (c *dynamicResourceClient) UpdateStatus(obj *unstructured.Unstructured) (*u
 }
 
 func (c *dynamicResourceClient) Delete(name string, opts *metav1.DeleteOptions) error {
-	if opts == nil {
-		opts = &metav1.DeleteOptions{}
-	}
 	if opts == nil {
 		opts = &metav1.DeleteOptions{}
 	}