--- sys/fs/nfsserver/nfs_nfsdstate.c.notimo	2021-04-04 10:29:24.475340000 -0700
+++ sys/fs/nfsserver/nfs_nfsdstate.c	2021-04-04 10:29:43.549018000 -0700
@@ -722,8 +722,6 @@ nfsrv_getclient(nfsquad_t clientid, int opflags, struc
 				SVC_ACQUIRE(nd->nd_xprt);
 				nd->nd_xprt->xp_p2 =
 				    clp->lc_req.nr_client->cl_private;
-				/* Disable idle timeout. */
-				nd->nd_xprt->xp_idletimeout = 0;
 				nsep->sess_cbsess.nfsess_xprt = nd->nd_xprt;
 			    } else
 				nsep->sess_crflags &= ~NFSV4CRSESS_CONNBACKCHAN;
@@ -6442,8 +6440,6 @@ nfsrv_bindconnsess(struct nfsrv_descript *nd, uint8_t 
 				SVC_ACQUIRE(nd->nd_xprt);
 				nd->nd_xprt->xp_p2 =
 				    clp->lc_req.nr_client->cl_private;
-				/* Disable idle timeout. */
-				nd->nd_xprt->xp_idletimeout = 0;
 				sep->sess_cbsess.nfsess_xprt = nd->nd_xprt;
 				sep->sess_crflags |= NFSV4CRSESS_CONNBACKCHAN;
 				clp->lc_flags |= LCL_DONEBINDCONN |