diff --git a/http2/h2demo/Dockerfile b/http2/h2demo/Dockerfile
index 55cd9dbd..313a0255 100644
--- a/http2/h2demo/Dockerfile
+++ b/http2/h2demo/Dockerfile
@@ -25,7 +25,7 @@ COPY . /go/src/golang.org/x/net
 
 # Install binary to /go/bin:
 WORKDIR /go/src/golang.org/x/net/http2/h2demo
-RUN go install -tags "h2demo netgo"
+RUN go install -tags "netgo"
 
 
 FROM debian:stretch
diff --git a/http2/h2demo/h2demo.go b/http2/h2demo/h2demo.go
index 196a2a4e..5716da2a 100644
--- a/http2/h2demo/h2demo.go
+++ b/http2/h2demo/h2demo.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build h2demo
-
 package main
 
 import (
diff --git a/http2/h2demo/tmpl.go b/http2/h2demo/tmpl.go
index 09fc7299..d898c1fa 100644
--- a/http2/h2demo/tmpl.go
+++ b/http2/h2demo/tmpl.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build h2demo
-
 package main
 
 import "html/template"