diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install/install.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install/install.go
index eadc3fddad..0addd14182 100644
--- a/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install/install.go
+++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install/install.go
@@ -76,7 +76,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
 	if err := registered.RegisterGroup(groupMeta); err != nil {
 		return err
 	}
-	api.RegisterRESTMapper(groupMeta.RESTMapper)
 	return nil
 }
 
diff --git a/federation/apis/core/install/install.go b/federation/apis/core/install/install.go
index cf5da67aab..961ceb545e 100644
--- a/federation/apis/core/install/install.go
+++ b/federation/apis/core/install/install.go
@@ -81,7 +81,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
 	if err := registered.RegisterGroup(groupMeta); err != nil {
 		return err
 	}
-	api.RegisterRESTMapper(groupMeta.RESTMapper)
 	return nil
 }
 
diff --git a/federation/apis/federation/install/install.go b/federation/apis/federation/install/install.go
index edd850fa27..e55897e79f 100644
--- a/federation/apis/federation/install/install.go
+++ b/federation/apis/federation/install/install.go
@@ -81,7 +81,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
 	if err := registered.RegisterGroup(groupMeta); err != nil {
 		return err
 	}
-	api.RegisterRESTMapper(groupMeta.RESTMapper)
 	return nil
 }
 
diff --git a/pkg/api/install/install.go b/pkg/api/install/install.go
index 517521dc50..644daad2ba 100644
--- a/pkg/api/install/install.go
+++ b/pkg/api/install/install.go
@@ -82,7 +82,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
 	if err := registered.RegisterGroup(groupMeta); err != nil {
 		return err
 	}
-	api.RegisterRESTMapper(groupMeta.RESTMapper)
 	return nil
 }
 
diff --git a/pkg/api/mapper.go b/pkg/api/mapper.go
index c5876b8cad..c5743c4b58 100644
--- a/pkg/api/mapper.go
+++ b/pkg/api/mapper.go
@@ -25,16 +25,6 @@ import (
 	"k8s.io/kubernetes/pkg/util/sets"
 )
 
-var RESTMapper meta.RESTMapper
-
-func init() {
-	RESTMapper = meta.MultiRESTMapper{}
-}
-
-func RegisterRESTMapper(m meta.RESTMapper) {
-	RESTMapper = append(RESTMapper.(meta.MultiRESTMapper), m)
-}
-
 // Instantiates a DefaultRESTMapper based on types registered in api.Scheme
 func NewDefaultRESTMapper(defaultGroupVersions []unversioned.GroupVersion, interfacesFunc meta.VersionInterfacesFunc,
 	importPathPrefix string, ignoredKinds, rootScoped sets.String) *meta.DefaultRESTMapper {
diff --git a/pkg/apimachinery/announced/group_factory.go b/pkg/apimachinery/announced/group_factory.go
index 6ec507c20a..75b22c0636 100644
--- a/pkg/apimachinery/announced/group_factory.go
+++ b/pkg/apimachinery/announced/group_factory.go
@@ -243,7 +243,5 @@ func (gmf *GroupMetaFactory) RegisterAndEnable() error {
 		return err
 	}
 
-	// TODO: find a sane way to register the rest mappers.
-	api.RegisterRESTMapper(registered.GroupOrDie(gmf.GroupArgs.GroupName).RESTMapper)
 	return nil
 }
diff --git a/pkg/apis/apps/install/install.go b/pkg/apis/apps/install/install.go
index b7139828fc..4f57fb400f 100644
--- a/pkg/apis/apps/install/install.go
+++ b/pkg/apis/apps/install/install.go
@@ -79,7 +79,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
 	if err := registered.RegisterGroup(groupMeta); err != nil {
 		return err
 	}
-	api.RegisterRESTMapper(groupMeta.RESTMapper)
 	return nil
 }
 
diff --git a/pkg/apis/authentication/install/install.go b/pkg/apis/authentication/install/install.go
index 7ad9d3496e..3e7c23f89a 100644
--- a/pkg/apis/authentication/install/install.go
+++ b/pkg/apis/authentication/install/install.go
@@ -83,7 +83,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
 	if err := registered.RegisterGroup(groupMeta); err != nil {
 		return err
 	}
-	api.RegisterRESTMapper(groupMeta.RESTMapper)
 	return nil
 }
 
diff --git a/pkg/apis/authorization/install/install.go b/pkg/apis/authorization/install/install.go
index 2c474fde47..f0a3cb90a2 100644
--- a/pkg/apis/authorization/install/install.go
+++ b/pkg/apis/authorization/install/install.go
@@ -83,7 +83,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
 	if err := registered.RegisterGroup(groupMeta); err != nil {
 		return err
 	}
-	api.RegisterRESTMapper(groupMeta.RESTMapper)
 	return nil
 }
 
diff --git a/pkg/apis/autoscaling/install/install.go b/pkg/apis/autoscaling/install/install.go
index 7cb61126b7..5419981854 100644
--- a/pkg/apis/autoscaling/install/install.go
+++ b/pkg/apis/autoscaling/install/install.go
@@ -83,7 +83,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
 	if err := registered.RegisterGroup(groupMeta); err != nil {
 		return err
 	}
-	api.RegisterRESTMapper(groupMeta.RESTMapper)
 	return nil
 }
 
diff --git a/pkg/apis/certificates/install/install.go b/pkg/apis/certificates/install/install.go
index 7fb22de411..84bf9f1729 100644
--- a/pkg/apis/certificates/install/install.go
+++ b/pkg/apis/certificates/install/install.go
@@ -83,7 +83,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
 	if err := registered.RegisterGroup(groupMeta); err != nil {
 		return err
 	}
-	api.RegisterRESTMapper(groupMeta.RESTMapper)
 	return nil
 }
 
diff --git a/pkg/apis/componentconfig/install/install.go b/pkg/apis/componentconfig/install/install.go
index ea591afadf..b66fab041a 100644
--- a/pkg/apis/componentconfig/install/install.go
+++ b/pkg/apis/componentconfig/install/install.go
@@ -83,7 +83,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
 	if err := registered.RegisterGroup(groupMeta); err != nil {
 		return err
 	}
-	api.RegisterRESTMapper(groupMeta.RESTMapper)
 	return nil
 }
 
diff --git a/pkg/apis/extensions/install/install.go b/pkg/apis/extensions/install/install.go
index 50bbf7fdff..ed5f9607aa 100644
--- a/pkg/apis/extensions/install/install.go
+++ b/pkg/apis/extensions/install/install.go
@@ -83,7 +83,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
 	if err := registered.RegisterGroup(groupMeta); err != nil {
 		return err
 	}
-	api.RegisterRESTMapper(groupMeta.RESTMapper)
 	return nil
 }
 
diff --git a/pkg/apis/imagepolicy/install/install.go b/pkg/apis/imagepolicy/install/install.go
index 29a0b7ae2d..9a2a7fbb4c 100644
--- a/pkg/apis/imagepolicy/install/install.go
+++ b/pkg/apis/imagepolicy/install/install.go
@@ -83,7 +83,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
 	if err := registered.RegisterGroup(groupMeta); err != nil {
 		return err
 	}
-	api.RegisterRESTMapper(groupMeta.RESTMapper)
 	return nil
 }
 
diff --git a/pkg/apis/policy/install/install.go b/pkg/apis/policy/install/install.go
index 4ac0ccbdc5..993b1fb735 100644
--- a/pkg/apis/policy/install/install.go
+++ b/pkg/apis/policy/install/install.go
@@ -83,7 +83,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
 	if err := registered.RegisterGroup(groupMeta); err != nil {
 		return err
 	}
-	api.RegisterRESTMapper(groupMeta.RESTMapper)
 	return nil
 }
 
diff --git a/pkg/apis/rbac/install/install.go b/pkg/apis/rbac/install/install.go
index bfa9eea3ff..810d8e9357 100644
--- a/pkg/apis/rbac/install/install.go
+++ b/pkg/apis/rbac/install/install.go
@@ -83,7 +83,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
 	if err := registered.RegisterGroup(groupMeta); err != nil {
 		return err
 	}
-	api.RegisterRESTMapper(groupMeta.RESTMapper)
 	return nil
 }
 
diff --git a/pkg/apis/storage/install/install.go b/pkg/apis/storage/install/install.go
index 52801618bc..414f90de48 100644
--- a/pkg/apis/storage/install/install.go
+++ b/pkg/apis/storage/install/install.go
@@ -83,7 +83,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
 	if err := registered.RegisterGroup(groupMeta); err != nil {
 		return err
 	}
-	api.RegisterRESTMapper(groupMeta.RESTMapper)
 	return nil
 }
 
diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go
index 13f18aeaaf..0101d71753 100644
--- a/pkg/kubectl/cmd/util/factory.go
+++ b/pkg/kubectl/cmd/util/factory.go
@@ -711,7 +711,6 @@ func NewFactory(optionalClientConfig clientcmd.ClientConfig) *Factory {
 					c:        restclient,
 					fedc:     fedClient,
 					cacheDir: dir,
-					mapper:   api.RESTMapper,
 				}, nil
 			}
 			return validation.NullSchema{}, nil
@@ -974,7 +973,6 @@ type clientSwaggerSchema struct {
 	c        *restclient.RESTClient
 	fedc     *restclient.RESTClient
 	cacheDir string
-	mapper   meta.RESTMapper
 }
 
 const schemaFileName = "schema.json"