diff --git a/p2p/host/basic/basic_host.go b/p2p/host/basic/basic_host.go
index d89a75f150..7393100826 100644
--- a/p2p/host/basic/basic_host.go
+++ b/p2p/host/basic/basic_host.go
@@ -50,7 +50,7 @@ var log = logging.Logger("basichost")
 
 var (
 	// DefaultNegotiationTimeout is the default value for HostOpts.NegotiationTimeout.
-	DefaultNegotiationTimeout = time.Second * 60
+	DefaultNegotiationTimeout = 10 * time.Second
 
 	// DefaultAddrsFactory is the default value for HostOpts.AddrsFactory.
 	DefaultAddrsFactory = func(addrs []ma.Multiaddr) []ma.Multiaddr { return addrs }
@@ -944,7 +944,7 @@ func (h *BasicHost) AllAddrs() []ma.Multiaddr {
 
 			// Did the router give us a routable public addr?
 			if manet.IsPublicAddr(extMaddr) {
-				//well done
+				// well done
 				continue
 			}