diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index dfd150ce2..fe5c2dc47 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -860,235 +860,235 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/validation",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/validation/path",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/proxy",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/rand",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/uuid",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "7f7f174b7ea93b968ead906bd826cbb4eb9a1a00"
+			"Rev": "787c4387768a368803c9b1e8d639ee9ddfaa7507"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/discovery",
diff --git a/pkg/endpoints/handlers/rest.go b/pkg/endpoints/handlers/rest.go
index e4f8565f6..7b1aa2d60 100644
--- a/pkg/endpoints/handlers/rest.go
+++ b/pkg/endpoints/handlers/rest.go
@@ -987,10 +987,11 @@ func DeleteResource(r rest.GracefulDeleter, allowsOptions bool, scope RequestSco
 					scope.err(fmt.Errorf("decoded object cannot be converted to DeleteOptions"), w, req)
 					return
 				}
+				trace.Step("Decoded delete options")
 
-				trace.Step("About to record audit event")
 				ae := request.AuditEventFrom(ctx)
 				audit.LogRequestObject(ae, obj, scope.Resource, scope.Subresource, scope.Serializer)
+				trace.Step("Recorded the audit event")
 			} else {
 				if values := req.URL.Query(); len(values) > 0 {
 					if err := metainternalversion.ParameterCodec.DecodeParameters(values, scope.MetaGroupVersion, options); err != nil {
@@ -1002,8 +1003,8 @@ func DeleteResource(r rest.GracefulDeleter, allowsOptions bool, scope RequestSco
 			}
 		}
 
+		trace.Step("About to check admission control")
 		if admit != nil && admit.Handles(admission.Delete) {
-			trace.Step("About to check admission control")
 			userInfo, _ := request.UserFrom(ctx)
 
 			err = admit.Admit(admission.NewAttributesRecord(nil, nil, scope.Kind, namespace, name, scope.Resource, scope.Subresource, admission.Delete, userInfo))