diff --git a/pkg/apis/abac/types.go b/pkg/apis/abac/types.go
index 1a192f21802..751fdc7378c 100644
--- a/pkg/apis/abac/types.go
+++ b/pkg/apis/abac/types.go
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:openapi-gen=true
 package abac
 
 import (
diff --git a/pkg/apis/apps/doc.go b/pkg/apis/apps/doc.go
index cee5cfbfbf9..f3d76d9217d 100644
--- a/pkg/apis/apps/doc.go
+++ b/pkg/apis/apps/doc.go
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
-// +k8s:openapi-gen=true
 // +groupName=apps.k8s.io
 
 package apps // import "k8s.io/kubernetes/pkg/apis/apps"
diff --git a/pkg/apis/authentication/doc.go b/pkg/apis/authentication/doc.go
index 8f2bf397faa..88bdf625b73 100644
--- a/pkg/apis/authentication/doc.go
+++ b/pkg/apis/authentication/doc.go
@@ -16,5 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package,register
 // +groupName=authentication.k8s.io
-// +k8s:openapi-gen=true
 package authentication // import "k8s.io/kubernetes/pkg/apis/authentication"
diff --git a/pkg/apis/authorization/doc.go b/pkg/apis/authorization/doc.go
index 70b6be93d45..29f9b624203 100644
--- a/pkg/apis/authorization/doc.go
+++ b/pkg/apis/authorization/doc.go
@@ -15,7 +15,5 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
-// +k8s:openapi-gen=true
-
 // +groupName=authorization.k8s.io
 package authorization // import "k8s.io/kubernetes/pkg/apis/authorization"
diff --git a/pkg/apis/autoscaling/doc.go b/pkg/apis/autoscaling/doc.go
index 3e0aba31af3..d9e11576f92 100644
--- a/pkg/apis/autoscaling/doc.go
+++ b/pkg/apis/autoscaling/doc.go
@@ -15,6 +15,5 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
-// +k8s:openapi-gen=true
 
 package autoscaling // import "k8s.io/kubernetes/pkg/apis/autoscaling"
diff --git a/pkg/apis/batch/doc.go b/pkg/apis/batch/doc.go
index ac8c43f8e18..9b2b792bd51 100644
--- a/pkg/apis/batch/doc.go
+++ b/pkg/apis/batch/doc.go
@@ -15,6 +15,5 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
-// +k8s:openapi-gen=true
 
 package batch // import "k8s.io/kubernetes/pkg/apis/batch"
diff --git a/pkg/apis/certificates/doc.go b/pkg/apis/certificates/doc.go
index d133160c6c3..cdc89bdcc5e 100644
--- a/pkg/apis/certificates/doc.go
+++ b/pkg/apis/certificates/doc.go
@@ -15,7 +15,5 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
-// +k8s:openapi-gen=true
-
 // +groupName=certificates.k8s.io
 package certificates // import "k8s.io/kubernetes/pkg/apis/certificates"
diff --git a/pkg/apis/componentconfig/doc.go b/pkg/apis/componentconfig/doc.go
index 2982d246c9b..8fe8d52edcb 100644
--- a/pkg/apis/componentconfig/doc.go
+++ b/pkg/apis/componentconfig/doc.go
@@ -15,6 +15,5 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
-// +k8s:openapi-gen=true
 
 package componentconfig // import "k8s.io/kubernetes/pkg/apis/componentconfig"
diff --git a/pkg/apis/extensions/doc.go b/pkg/apis/extensions/doc.go
index 9760521169e..fbce8ee707d 100644
--- a/pkg/apis/extensions/doc.go
+++ b/pkg/apis/extensions/doc.go
@@ -15,6 +15,5 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
-// +k8s:openapi-gen=true
 
 package extensions // import "k8s.io/kubernetes/pkg/apis/extensions"
diff --git a/pkg/apis/imagepolicy/doc.go b/pkg/apis/imagepolicy/doc.go
index 0b898862e2b..e69aee39738 100644
--- a/pkg/apis/imagepolicy/doc.go
+++ b/pkg/apis/imagepolicy/doc.go
@@ -16,6 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package,register
 // +groupName=imagepolicy.k8s.io
-// +k8s:openapi-gen=true
-
 package imagepolicy // import "k8s.io/kubernetes/pkg/apis/imagepolicy"
diff --git a/pkg/apis/policy/doc.go b/pkg/apis/policy/doc.go
index d7cd7a9b7a5..86f4cd56079 100644
--- a/pkg/apis/policy/doc.go
+++ b/pkg/apis/policy/doc.go
@@ -15,6 +15,5 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
-// +k8s:openapi-gen=true
 
 package policy // import "k8s.io/kubernetes/pkg/apis/policy"
diff --git a/pkg/apis/rbac/doc.go b/pkg/apis/rbac/doc.go
index b0251805bd2..b264fb9a02e 100644
--- a/pkg/apis/rbac/doc.go
+++ b/pkg/apis/rbac/doc.go
@@ -15,7 +15,5 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
-// +k8s:openapi-gen=true
-
 // +groupName=rbac.authorization.k8s.io
 package rbac // import "k8s.io/kubernetes/pkg/apis/rbac"
diff --git a/pkg/apis/storage/doc.go b/pkg/apis/storage/doc.go
index 5fab4777b08..51dbb344c74 100644
--- a/pkg/apis/storage/doc.go
+++ b/pkg/apis/storage/doc.go
@@ -16,5 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package,register
 // +groupName=storage.k8s.io
-// +g8k:openapi-gen=true
 package storage // import "k8s.io/kubernetes/pkg/apis/storage"