diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/typeconverter.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/typeconverter.go
index 0ffeac6f530..3ff7507b32c 100644
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/typeconverter.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/typeconverter.go
@@ -74,17 +74,13 @@ func (c *typeConverter) TypedToObject(value *typed.TypedValue) (runtime.Object,
 	return valueToObject(value.AsValue())
 }
 
+type deducedTypeConverter struct{}
+
 // DeducedTypeConverter is a TypeConverter for CRDs that don't have a
 // schema. It does implement the same interface though (and create the
 // same types of objects), so that everything can still work the same.
 // CRDs are merged with all their fields being "atomic" (lists
 // included).
-//
-// Note that this is not going to be sufficient for converting to/from
-// CRDs that have a schema defined (we don't support that schema yet).
-// TODO(jennybuckley): Use the schema provided by a CRD if it exists.
-type deducedTypeConverter struct{}
-
 func NewDeducedTypeConverter() TypeConverter {
 	return deducedTypeConverter{}
 }
diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/typeconverter.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/typeconverter.go
index 62a4c353664..0aa97f7e790 100644
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/typeconverter.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/typeconverter.go
@@ -30,10 +30,6 @@ type TypeConverter = internal.TypeConverter
 // create the same types of objects), so that everything can still work
 // the same. CRDs are merged with all their fields being "atomic" (lists
 // included).
-//
-// Note that this is not going to be sufficient for converting to/from
-// CRDs that have a schema defined (we don't support that schema yet).
-// TODO(jennybuckley): Use the schema provided by a CRD if it exists.
 func NewDeducedTypeConverter() TypeConverter {
 	return internal.NewDeducedTypeConverter()
 }