diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
index f7d75ca7b8b..9764f543846 100755
--- a/hack/update-codegen.sh
+++ b/hack/update-codegen.sh
@@ -413,7 +413,7 @@ function codegen::defaults() {
 # IDL.
 function codegen::conversions() {
     # Build the tool.
-    GO111MODULE=on GOPROXY=off go install \
+    GOPROXY=off go install \
         k8s.io/code-generator/cmd/conversion-gen
 
     # The result file, in each pkg, of conversion generation.
@@ -438,7 +438,7 @@ function codegen::conversions() {
 
     local tag_pkgs=()
     for dir in "${tag_dirs[@]}"; do
-        tag_pkgs+=("${PRJ_SRC_PATH}/$dir")
+        tag_pkgs+=("./$dir")
     done
 
     local extra_peer_pkgs=(
@@ -457,13 +457,12 @@ function codegen::conversions() {
 
     git_find -z ':(glob)**'/"${output_file}.go" | xargs -0 rm -f
 
-    ./hack/run-in-gopath.sh "${gen_conversion_bin}" \
+    "${gen_conversion_bin}" \
         --v "${KUBE_VERBOSE}" \
         --logtostderr \
         --go-header-file "${BOILERPLATE_FILENAME}" \
         --output-file-base "${output_file}" \
         $(printf -- " --extra-peer-dirs %s" "${extra_peer_pkgs[@]}") \
-        $(printf -- " --extra-dirs %s" "${tag_pkgs[@]}") \
         $(printf -- " -i %s" "${tag_pkgs[@]}") \
         "$@"
 
diff --git a/staging/src/k8s.io/client-go/scale/scheme/appsv1beta1/doc.go b/staging/src/k8s.io/client-go/scale/scheme/appsv1beta1/doc.go
index 830619b449f..aea95e2e4cf 100644
--- a/staging/src/k8s.io/client-go/scale/scheme/appsv1beta1/doc.go
+++ b/staging/src/k8s.io/client-go/scale/scheme/appsv1beta1/doc.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/client-go/scale/scheme
+// +k8s:conversion-gen=k8s.io/client-go/scale/scheme
 // +k8s:conversion-gen-external-types=k8s.io/api/apps/v1beta1
 
 package appsv1beta1 // import "k8s.io/client-go/scale/scheme/appsv1beta1"
diff --git a/staging/src/k8s.io/client-go/scale/scheme/appsv1beta2/doc.go b/staging/src/k8s.io/client-go/scale/scheme/appsv1beta2/doc.go
index c21a56d5693..d1ae2118e94 100644
--- a/staging/src/k8s.io/client-go/scale/scheme/appsv1beta2/doc.go
+++ b/staging/src/k8s.io/client-go/scale/scheme/appsv1beta2/doc.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/client-go/scale/scheme
+// +k8s:conversion-gen=k8s.io/client-go/scale/scheme
 // +k8s:conversion-gen-external-types=k8s.io/api/apps/v1beta2
 
 package appsv1beta2 // import "k8s.io/client-go/scale/scheme/appsv1beta2"
diff --git a/staging/src/k8s.io/client-go/scale/scheme/autoscalingv1/doc.go b/staging/src/k8s.io/client-go/scale/scheme/autoscalingv1/doc.go
index 03684dd90d9..25f23d2d8c1 100644
--- a/staging/src/k8s.io/client-go/scale/scheme/autoscalingv1/doc.go
+++ b/staging/src/k8s.io/client-go/scale/scheme/autoscalingv1/doc.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/client-go/scale/scheme
+// +k8s:conversion-gen=k8s.io/client-go/scale/scheme
 // +k8s:conversion-gen-external-types=k8s.io/api/autoscaling/v1
 
 package autoscalingv1 // import "k8s.io/client-go/scale/scheme/autoscalingv1"
diff --git a/staging/src/k8s.io/client-go/scale/scheme/extensionsv1beta1/doc.go b/staging/src/k8s.io/client-go/scale/scheme/extensionsv1beta1/doc.go
index 1e719884f07..de633889a13 100644
--- a/staging/src/k8s.io/client-go/scale/scheme/extensionsv1beta1/doc.go
+++ b/staging/src/k8s.io/client-go/scale/scheme/extensionsv1beta1/doc.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/client-go/scale/scheme
+// +k8s:conversion-gen=k8s.io/client-go/scale/scheme
 // +k8s:conversion-gen-external-types=k8s.io/api/extensions/v1beta1
 
 package extensionsv1beta1 // import "k8s.io/client-go/scale/scheme/extensionsv1beta1"