diff --git a/pkg/apis/certmanager/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/certmanager/v1alpha1/zz_generated.deepcopy.go
index fe00dd5a9..8b9bfb4ab 100644
--- a/pkg/apis/certmanager/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/certmanager/v1alpha1/zz_generated.deepcopy.go
@@ -652,7 +652,7 @@ func (in *CertificateDNSNameSelector) DeepCopy() *CertificateDNSNameSelector {
 func (in *CertificateList) DeepCopyInto(out *CertificateList) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
 	if in.Items != nil {
 		in, out := &in.Items, &out.Items
 		*out = make([]Certificate, len(*in))
@@ -733,7 +733,7 @@ func (in *CertificateRequestCondition) DeepCopy() *CertificateRequestCondition {
 func (in *CertificateRequestList) DeepCopyInto(out *CertificateRequestList) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
 	if in.Items != nil {
 		in, out := &in.Items, &out.Items
 		*out = make([]CertificateRequest, len(*in))
@@ -932,7 +932,7 @@ func (in *Challenge) DeepCopyObject() runtime.Object {
 func (in *ChallengeList) DeepCopyInto(out *ChallengeList) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
 	if in.Items != nil {
 		in, out := &in.Items, &out.Items
 		*out = make([]Challenge, len(*in))
@@ -1036,7 +1036,7 @@ func (in *ClusterIssuer) DeepCopyObject() runtime.Object {
 func (in *ClusterIssuerList) DeepCopyInto(out *ClusterIssuerList) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
 	if in.Items != nil {
 		in, out := &in.Items, &out.Items
 		*out = make([]ClusterIssuer, len(*in))
@@ -1217,7 +1217,7 @@ func (in *IssuerConfig) DeepCopy() *IssuerConfig {
 func (in *IssuerList) DeepCopyInto(out *IssuerList) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
 	if in.Items != nil {
 		in, out := &in.Items, &out.Items
 		*out = make([]Issuer, len(*in))
@@ -1355,7 +1355,7 @@ func (in *Order) DeepCopyObject() runtime.Object {
 func (in *OrderList) DeepCopyInto(out *OrderList) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
 	if in.Items != nil {
 		in, out := &in.Items, &out.Items
 		*out = make([]Order, len(*in))
diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go
index 15c39d66e..fda20fa04 100644
--- a/pkg/client/clientset/versioned/clientset.go
+++ b/pkg/client/clientset/versioned/clientset.go
@@ -28,8 +28,6 @@ import (
 type Interface interface {
 	Discovery() discovery.DiscoveryInterface
 	CertmanagerV1alpha1() certmanagerv1alpha1.CertmanagerV1alpha1Interface
-	// Deprecated: please explicitly pick a version if possible.
-	Certmanager() certmanagerv1alpha1.CertmanagerV1alpha1Interface
 }
 
 // Clientset contains the clients for groups. Each group has exactly one
@@ -44,12 +42,6 @@ func (c *Clientset) CertmanagerV1alpha1() certmanagerv1alpha1.CertmanagerV1alpha
 	return c.certmanagerV1alpha1
 }
 
-// Deprecated: Certmanager retrieves the default version of CertmanagerClient.
-// Please explicitly pick a version.
-func (c *Clientset) Certmanager() certmanagerv1alpha1.CertmanagerV1alpha1Interface {
-	return c.certmanagerV1alpha1
-}
-
 // Discovery retrieves the DiscoveryClient
 func (c *Clientset) Discovery() discovery.DiscoveryInterface {
 	if c == nil {
diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go
index d864bf599..887305bb9 100644
--- a/pkg/client/clientset/versioned/fake/clientset_generated.go
+++ b/pkg/client/clientset/versioned/fake/clientset_generated.go
@@ -41,7 +41,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 		}
 	}
 
-	cs := &Clientset{}
+	cs := &Clientset{tracker: o}
 	cs.discovery = &fakediscovery.FakeDiscovery{Fake: &cs.Fake}
 	cs.AddReactor("*", "*", testing.ObjectReaction(o))
 	cs.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) {
@@ -63,20 +63,20 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 type Clientset struct {
 	testing.Fake
 	discovery *fakediscovery.FakeDiscovery
+	tracker   testing.ObjectTracker
 }
 
 func (c *Clientset) Discovery() discovery.DiscoveryInterface {
 	return c.discovery
 }
 
+func (c *Clientset) Tracker() testing.ObjectTracker {
+	return c.tracker
+}
+
 var _ clientset.Interface = &Clientset{}
 
 // CertmanagerV1alpha1 retrieves the CertmanagerV1alpha1Client
 func (c *Clientset) CertmanagerV1alpha1() certmanagerv1alpha1.CertmanagerV1alpha1Interface {
 	return &fakecertmanagerv1alpha1.FakeCertmanagerV1alpha1{Fake: &c.Fake}
 }
-
-// Certmanager retrieves the CertmanagerV1alpha1Client
-func (c *Clientset) Certmanager() certmanagerv1alpha1.CertmanagerV1alpha1Interface {
-	return &fakecertmanagerv1alpha1.FakeCertmanagerV1alpha1{Fake: &c.Fake}
-}
diff --git a/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/BUILD.bazel b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/BUILD.bazel
index d3dd8857b..a27129c07 100644
--- a/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/BUILD.bazel
+++ b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/BUILD.bazel
@@ -19,7 +19,6 @@ go_library(
         "//pkg/apis/certmanager/v1alpha1:go_default_library",
         "//pkg/client/clientset/versioned/scheme:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
         "//vendor/k8s.io/client-go/rest:go_default_library",
diff --git a/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/certmanager_client.go b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/certmanager_client.go
index 96d01ef06..50cbbfb79 100644
--- a/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/certmanager_client.go
+++ b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/certmanager_client.go
@@ -21,7 +21,6 @@ package v1alpha1
 import (
 	v1alpha1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha1"
 	"github.com/jetstack/cert-manager/pkg/client/clientset/versioned/scheme"
-	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	rest "k8s.io/client-go/rest"
 )
 
@@ -96,7 +95,7 @@ func setConfigDefaults(config *rest.Config) error {
 	gv := v1alpha1.SchemeGroupVersion
 	config.GroupVersion = &gv
 	config.APIPath = "/apis"
-	config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}
+	config.NegotiatedSerializer = scheme.Codecs.WithoutConversion()
 
 	if config.UserAgent == "" {
 		config.UserAgent = rest.DefaultKubernetesUserAgent()