diff --git a/agent/consul/serf.go b/agent/consul/serf.go
index ac5f30b8ea..27048a834a 100644
--- a/agent/consul/serf.go
+++ b/agent/consul/serf.go
@@ -139,9 +139,6 @@ func (s *Server) lanNodeJoin(me serf.MemberEvent) {
 			s.maybeBootstrap()
 		}
 
-		// Update id to address map
-		s.serverLookup.AddServer(serverMeta)
-
 		// Kick the join flooders.
 		s.FloodNotify()
 	}
diff --git a/agent/consul/server.go b/agent/consul/server.go
index 5c7ec63cef..9d63239b90 100644
--- a/agent/consul/server.go
+++ b/agent/consul/server.go
@@ -166,7 +166,8 @@ type Server struct {
 	// which SHOULD only consist of Consul servers
 	serfWAN *serf.Serf
 
-	// serverLookup provides fast and thread-safe lookup by id and address
+	// serverLookup tracks server consuls in the local datacenter.
+	// Used to do leader forwarding and provide fast lookup by server id and address
 	serverLookup *ServerLookup
 
 	// floodLock controls access to floodCh.