diff --git a/dashboard/env/linux-x86-base/Dockerfile b/dashboard/env/linux-x86-base/Dockerfile
index 37e1a081..9c8e6383 100644
--- a/dashboard/env/linux-x86-base/Dockerfile
+++ b/dashboard/env/linux-x86-base/Dockerfile
@@ -13,4 +13,4 @@ ADD /scripts/install-apt-deps.sh /scripts/
 RUN /scripts/install-apt-deps.sh
 
 ADD /scripts/build-go-builder.sh /scripts/
-RUN GO_REV=8c27884843c3 BUILDER_REV=ced78bfefcb3 /scripts/build-go-builder.sh && test -f /usr/local/bin/builder
+RUN GO_REV=8c27884843c3 BUILDER_REV=98c15d46be /scripts/build-go-builder.sh && test -f /usr/local/bin/builder
diff --git a/dashboard/env/linux-x86-base/scripts/build-go-builder.sh b/dashboard/env/linux-x86-base/scripts/build-go-builder.sh
index 097ac171..6167f300 100755
--- a/dashboard/env/linux-x86-base/scripts/build-go-builder.sh
+++ b/dashboard/env/linux-x86-base/scripts/build-go-builder.sh
@@ -12,9 +12,9 @@ curl -s https://storage.googleapis.com/gobuilder/go-snap.tar.gz | tar x --no-sam
 
 GO_TOOLS=$GOPATH/src/golang.org/x/tools
 mkdir -p $GO_TOOLS
-curl -s https://storage.googleapis.com/gobuilder/go.tools-snap.tar.gz | tar x --no-same-owner -zv -C $GO_TOOLS
+git clone https://go.googlesource.com/tools $GO_TOOLS
 
 mkdir -p $PREFIX/bin
-(cd $GO_TOOLS && hg pull -r $BUILDER_REV -u && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/tools/dashboard/builder)
+(cd $GO_TOOLS && git reset --hard $BUILDER_REV && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/tools/dashboard/builder)
 
 rm -fR $GOROOT/bin $GOROOT/pkg $GOPATH