diff --git a/src/WINNT/afsd/cm_conn.h b/src/WINNT/afsd/cm_conn.h
index bcd60222a7..a0b10fb88b 100644
--- a/src/WINNT/afsd/cm_conn.h
+++ b/src/WINNT/afsd/cm_conn.h
@@ -140,6 +140,9 @@ typedef struct cm_req {
 #define SERVERHAS64BIT(connp) (!((connp)->serverp->flags & CM_SERVERFLAG_NO64BIT))
 #define SET_SERVERHASNO64BIT(connp) (cm_SetServerNo64Bit((connp)->serverp, TRUE))
 
+#define SERVERHASINLINEBULK(connp) (!((connp)->serverp->flags & CM_SERVERFLAG_NOINLINEBULK))
+#define SET_SERVERHASNOINLINEBULK(connp) (cm_SetServerNoInlineBulk((connp)->serverp, TRUE))
+
 extern void cm_InitConn(void);
 
 extern void cm_InitReq(cm_req_t *reqp);
diff --git a/src/WINNT/afsd/cm_vnodeops.c b/src/WINNT/afsd/cm_vnodeops.c
index 6044a788aa..b813532db0 100644
--- a/src/WINNT/afsd/cm_vnodeops.c
+++ b/src/WINNT/afsd/cm_vnodeops.c
@@ -2495,11 +2495,11 @@ cm_TryBulkStatRPC(cm_scache_t *dscp, cm_bulkStat_t *bbp, cm_user_t *userp, cm_re
                 continue;
 
             rxconnp = cm_GetRxConn(connp);
-	    if (!(connp->serverp->flags & CM_SERVERFLAG_NOINLINEBULK)) {
+	    if (SERVERHASINLINEBULK(connp)) {
 		code = RXAFS_InlineBulkStatus(rxconnp, &fidStruct,
                                               &statStruct, &callbackStruct, &volSync);
 		if (code == RXGEN_OPCODE) {
-		    cm_SetServerNoInlineBulk(connp->serverp, 1);
+		    SET_SERVERHASNOINLINEBULK(connp);
 		} else {
 		    inlinebulk = 1;
 		}