diff --git a/hack/verify.sh b/hack/verify.sh
index c6748189a1..43278b73af 100755
--- a/hack/verify.sh
+++ b/hack/verify.sh
@@ -35,7 +35,6 @@ gometalinter.v2 --disable-all \
     --enable=structcheck \
     --enable=golint \
     --enable=deadcode \
-    --enable=goimports \
     --enable=errcheck \
     --enable=varcheck \
     --enable=goconst \
@@ -52,6 +51,7 @@ gometalinter.v2 --disable-all \
     --skip=atomic \
     ./pkg/...
 # TODO: Enable these as we fix them to make them pass
+#    --enable=goimports \
 #    --enable=gosec \
 #    --enable=maligned \
 #    --enable=safesql \
diff --git a/pkg/builder/build.go b/pkg/builder/build.go
index fc3e379873..d00b036384 100644
--- a/pkg/builder/build.go
+++ b/pkg/builder/build.go
@@ -38,7 +38,7 @@ var newController = controller.New
 var newManager = manager.New
 var getGvk = apiutil.GVKForObject
 
-// Builder builds an Application ControllerManagedBy (e.g. Operator) and returns a manager.Manager to start it.
+// Builder builds a Controller.
 type Builder struct {
 	apiType        runtime.Object
 	mgr            manager.Manager