diff --git a/lib/libc/rpc/rpcb_clnt.c b/lib/libc/rpc/rpcb_clnt.c
index f39d99bfeee3..b44fd1c5e77b 100644
--- a/lib/libc/rpc/rpcb_clnt.c
+++ b/lib/libc/rpc/rpcb_clnt.c
@@ -741,6 +741,16 @@ __rpcb_findaddr_timed(rpcprog_t program, rpcvers_t version,
 		rpcvers_t pmapvers = 2;
 		struct pmap pmapparms;
 
+		/*
+		 * The comment below is now very old, having
+		 * been committed to FreeBSD during an import
+		 * from NetBSD in 2001.  I do not believe there
+		 * will still be any rpcbind servers that do
+		 * UDP only and, since Azure requires use of
+		 * TCP for NFSv3 mounts, comment this out
+		 * so that NFSv3 mounts on Azure can work.
+		 */
+#ifdef notnow
 		/*
 		 * Try UDP only - there are some portmappers out
 		 * there that use UDP only.
@@ -754,9 +764,9 @@ __rpcb_findaddr_timed(rpcprog_t program, rpcvers_t version,
 			}
 			client = getclnthandle(host, newnconf, &parms.r_addr);
 			freenetconfigent(newnconf);
-		} else {
+		} else
+#endif
 			client = getclnthandle(host, nconf, &parms.r_addr);
-		}
 		if (client == NULL)
 			return (NULL);