diff --git a/hack/generate-bindata.sh b/hack/generate-bindata.sh
index 25cd5d75d96..5fa34ba65d6 100755
--- a/hack/generate-bindata.sh
+++ b/hack/generate-bindata.sh
@@ -28,14 +28,12 @@ if [[ ! -d "${KUBE_ROOT}/pkg" ]]; then
 	exit 1
 fi
 
-# kube::golang::build_kube_toolchain installs the vendored go-bindata in
-# $GOPATH/bin, so make sure that's explicitly part of our $PATH.
-export PATH="${KUBE_OUTPUT_BINPATH}:${PATH}"
+# Ensure that we find the binaries we build before anything else.
+export GOBIN="${KUBE_OUTPUT_BINPATH}"
+PATH="${GOBIN}:${PATH}"
 
-if ! which go-bindata &>/dev/null ; then
-	echo "Cannot find go-bindata."
-	exit 5
-fi
+# Install tools we need, but only from vendor/...
+go install k8s.io/kubernetes/vendor/github.com/go-bindata/go-bindata/...
 
 # run the generation from the root directory for stable output
 pushd "${KUBE_ROOT}" >/dev/null