diff --git a/server/trillian_log_server/main.go b/server/trillian_log_server/main.go
index fbaa11f8c3..a6cd315893 100644
--- a/server/trillian_log_server/main.go
+++ b/server/trillian_log_server/main.go
@@ -101,7 +101,7 @@ func main() {
 
 	client, err := etcd.NewClientFromString(*server.EtcdServers)
 	if err != nil {
-		glog.Exitf("Failed to connect to etcd at %v: %v", server.EtcdServers, err)
+		glog.Exitf("Failed to connect to etcd at %v: %v", *server.EtcdServers, err)
 	}
 
 	// Announce our endpoints to etcd if so configured.
diff --git a/util/etcd/client.go b/util/etcd/client.go
index ab08697517..f80c257bf5 100644
--- a/util/etcd/client.go
+++ b/util/etcd/client.go
@@ -34,8 +34,10 @@ import (
 // the same version of etcd in external codebases. Could Go modules help?
 func NewClient(endpoints []string, dialTimeout time.Duration) (*clientv3.Client, error) {
 	return clientv3.New(clientv3.Config{
-		Endpoints:   endpoints,
-		DialTimeout: dialTimeout,
+		Endpoints: endpoints,
+		// TODO(daviddrysdale): re-enable dial timeout when upstream client code fixed
+		// for https://github.com/grpc/grpc-go/pull/2733/files#r271705181
+		// DialTimeout: dialTimeout,
 	})
 }