diff --git a/daemon/namespace.c b/daemon/namespace.c
index e486056..d6c9765 100644
--- a/daemon/namespace.c
+++ b/daemon/namespace.c
@@ -357,7 +357,7 @@ int nfs41_root_mount_addrs(
         goto out;
 
     /* create an rpc client */
-    status = nfs41_rpc_clnt_create(addrs, root->wsize, root->rsize, !is_data, 
+    status = nfs41_rpc_clnt_create(addrs, root->wsize, root->rsize,
         root->uid, root->gid, root->sec_flavor, &rpc);
     if (status) {
         eprintf("nfs41_rpc_clnt_create() failed %d\n", status);
diff --git a/daemon/nfs41.h b/daemon/nfs41.h
index d2f6948..94c4ebb 100644
--- a/daemon/nfs41.h
+++ b/daemon/nfs41.h
@@ -443,7 +443,6 @@ int nfs41_rpc_clnt_create(
     IN const multi_addr4 *addrs,
     IN uint32_t wsize,
     IN uint32_t rsize,
-    IN bool_t needcb,
     IN uint32_t uid,
     IN uint32_t gid,
     IN uint32_t sec_flavor,
diff --git a/daemon/nfs41_rpc.c b/daemon/nfs41_rpc.c
index 953e41d..a77883a 100644
--- a/daemon/nfs41_rpc.c
+++ b/daemon/nfs41_rpc.c
@@ -151,7 +151,6 @@ int nfs41_rpc_clnt_create(
     IN const multi_addr4 *addrs,
     IN uint32_t wsize,
     IN uint32_t rsize,
-    bool_t needcb,
     IN uint32_t uid,
     IN uint32_t gid,
     IN uint32_t sec_flavor,
@@ -163,6 +162,7 @@ int nfs41_rpc_clnt_create(
     int status;
     char machname[MAXHOSTNAMELEN + 1];
     gid_t gids[1];
+    bool_t needcb = 1;
 
     rpc = calloc(1, sizeof(nfs41_rpc_clnt));
     if (rpc == NULL) {
diff --git a/daemon/nfs41_session.c b/daemon/nfs41_session.c
index ee70a8e..ff75363 100644
--- a/daemon/nfs41_session.c
+++ b/daemon/nfs41_session.c
@@ -292,13 +292,7 @@ int nfs41_session_create(
     }
 
     AcquireSRWLockShared(&client->exid_lock);
-#ifdef NO_CB_4_KRB5P
-    if ((client->roles & (EXCHGID4_FLAG_USE_PNFS_MDS |
-        EXCHGID4_FLAG_USE_NON_PNFS)) && client->rpc->needcb)
-#else
-    if (client->roles & (EXCHGID4_FLAG_USE_PNFS_MDS |
-        EXCHGID4_FLAG_USE_NON_PNFS))
-#endif
+    if (client->rpc->needcb)
         session->flags |= CREATE_SESSION4_FLAG_CONN_BACK_CHAN;
     session->flags |= CREATE_SESSION4_FLAG_PERSIST;
     ReleaseSRWLockShared(&client->exid_lock);