diff --git a/Makefile b/Makefile
index 788de8826..f7ca573d6 100644
--- a/Makefile
+++ b/Makefile
@@ -7,11 +7,8 @@ export PATH := ./bin:$(PATH)
 
 # Install all the build and lint dependencies
 setup:
-	rm -rf $$GOPATH/src/golang.org/x/tools
 	go get -u golang.org/x/tools/cmd/stringer
 	go get -u golang.org/x/tools/cmd/cover
-	# TODO: temporary hack for https://github.com/golang/go/issues/21387
-	(cd $$GOPATH/src/golang.org/x/tools; git checkout ae8cc594552814363a7aeeb4f2825515a771fa38; go install ./cmd/stringer/... ; go install ./cmd/cover/...)
 	curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh
 	curl -sfL https://install.goreleaser.com/github.com/gohugoio/hugo.sh | sh
 	curl -sfL https://install.goreleaser.com/github.com/caarlos0/bandep.sh | sh