diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresource/etcd.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresource/etcd.go
index 0cdb2dbaa12..138b05932fc 100644
--- a/staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresource/etcd.go
+++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresource/etcd.go
@@ -17,7 +17,6 @@ limitations under the License.
 package customresource
 
 import (
-	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -41,13 +40,6 @@ func NewREST(resource schema.GroupResource, listKind schema.GroupVersionKind, co
 			ret.SetGroupVersionKind(listKind)
 			return ret
 		},
-		ObjectNameFunc: func(obj runtime.Object) (string, error) {
-			accessor, err := meta.Accessor(obj)
-			if err != nil {
-				return "", err
-			}
-			return accessor.GetName(), nil
-		},
 		PredicateFunc:     strategy.MatchCustomResourceDefinitionStorage,
 		QualifiedResource: resource,
 
diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresourcedefinition/etcd.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresourcedefinition/etcd.go
index d19bffd1842..74c4f08b3e7 100644
--- a/staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresourcedefinition/etcd.go
+++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresourcedefinition/etcd.go
@@ -35,12 +35,9 @@ func NewREST(scheme *runtime.Scheme, optsGetter generic.RESTOptionsGetter) *REST
 	strategy := NewStrategy(scheme)
 
 	store := &genericregistry.Store{
-		Copier:      scheme,
-		NewFunc:     func() runtime.Object { return &apiextensions.CustomResourceDefinition{} },
-		NewListFunc: func() runtime.Object { return &apiextensions.CustomResourceDefinitionList{} },
-		ObjectNameFunc: func(obj runtime.Object) (string, error) {
-			return obj.(*apiextensions.CustomResourceDefinition).Name, nil
-		},
+		Copier:            scheme,
+		NewFunc:           func() runtime.Object { return &apiextensions.CustomResourceDefinition{} },
+		NewListFunc:       func() runtime.Object { return &apiextensions.CustomResourceDefinitionList{} },
 		PredicateFunc:     MatchCustomResourceDefinition,
 		QualifiedResource: apiextensions.Resource("customresourcedefinitions"),