diff --git a/Gopkg.lock b/Gopkg.lock
index 27bbb7132e6..a27f972746f 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -918,7 +918,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:a3d33cb49d37fae16881f4b7ba60c55c9d99237695f912b158b6b773e1a333f8"
+  digest = "1:51733e0105994029b3c8386da549def50d733d13938d93fbf870f03ff8c8acad"
   name = "github.com/weaveworks/common"
   packages = [
     "aws",
@@ -938,7 +938,7 @@
     "user",
   ]
   pruneopts = "UT"
-  revision = "80ff0769bb38e575cd85a64a4575a2ca1ef5ada5"
+  revision = "1a7a6b3820595d7682b7284682b733733005c57e"
 
 [[projects]]
   digest = "1:efac30de93ca1ff38050f46dc34f1338ebc8778de488f919f79ad9e6188719d3"
diff --git a/cmd/querier/main.go b/cmd/querier/main.go
index 421034427d8..81bc9a0f1c7 100644
--- a/cmd/querier/main.go
+++ b/cmd/querier/main.go
@@ -89,8 +89,7 @@ func main() {
 	}
 	defer chunkStore.Stop()
 
-	// TODO this avoids our middleware for logging and latecy collection.
-	worker, err := frontend.NewWorker(workerConfig, httpgrpc_server.NewServer(server.HTTP), util.Logger)
+	worker, err := frontend.NewWorker(workerConfig, httpgrpc_server.NewServer(server.HTTPServer.Handler), util.Logger)
 	if err != nil {
 		level.Error(util.Logger).Log("err", err)
 		os.Exit(1)
diff --git a/vendor/github.com/weaveworks/common/server/server.go b/vendor/github.com/weaveworks/common/server/server.go
index 898ceae0df1..d69dc4d5b62 100644
--- a/vendor/github.com/weaveworks/common/server/server.go
+++ b/vendor/github.com/weaveworks/common/server/server.go
@@ -66,13 +66,13 @@ func (cfg *Config) RegisterFlags(f *flag.FlagSet) {
 type Server struct {
 	cfg          Config
 	handler      *signals.Handler
-	httpListener net.Listener
 	grpcListener net.Listener
-	httpServer   *http.Server
+	httpListener net.Listener
 
-	HTTP *mux.Router
-	GRPC *grpc.Server
-	Log  logging.Interface
+	HTTP       *mux.Router
+	HTTPServer *http.Server
+	GRPC       *grpc.Server
+	Log        logging.Interface
 }
 
 // New makes a new Server
@@ -163,12 +163,12 @@ func New(cfg Config) (*Server, error) {
 		cfg:          cfg,
 		httpListener: httpListener,
 		grpcListener: grpcListener,
-		httpServer:   httpServer,
 		handler:      signals.NewHandler(log),
 
-		HTTP: router,
-		GRPC: grpcServer,
-		Log:  log,
+		HTTP:       router,
+		HTTPServer: httpServer,
+		GRPC:       grpcServer,
+		Log:        log,
 	}, nil
 }
 
@@ -180,7 +180,7 @@ func RegisterInstrumentation(router *mux.Router) {
 
 // Run the server; blocks until SIGTERM or an error is received.
 func (s *Server) Run() error {
-	errChan := make(chan error)
+	errChan := make(chan error, 1)
 
 	// Wait for a signal
 	go func() {
@@ -192,7 +192,7 @@ func (s *Server) Run() error {
 	}()
 
 	go func() {
-		err := s.httpServer.Serve(s.httpListener)
+		err := s.HTTPServer.Serve(s.httpListener)
 		if err == http.ErrServerClosed {
 			err = nil
 		}
@@ -232,6 +232,6 @@ func (s *Server) Shutdown() {
 	ctx, cancel := context.WithTimeout(context.Background(), s.cfg.ServerGracefulShutdownTimeout)
 	defer cancel() // releases resources if httpServer.Shutdown completes before timeout elapses
 
-	s.httpServer.Shutdown(ctx)
+	s.HTTPServer.Shutdown(ctx)
 	s.GRPC.GracefulStop()
 }