diff --git a/src/vol/fssync-server.c b/src/vol/fssync-server.c
index 14d2247826..c90d86eca0 100644
--- a/src/vol/fssync-server.c
+++ b/src/vol/fssync-server.c
@@ -1986,21 +1986,32 @@ FSYNC_Drop(osi_socket fd)
     struct offlineInfo *p;
     int i;
     Error error;
+#ifndef AFS_DEMAND_ATTACH_FS
     char tvolName[VMAXPATHLEN];
+#endif
 
     VOL_LOCK;
     p = OfflineVolumes[FindHandler(fd)];
     for (i = 0; i < MAXOFFLINEVOLUMES; i++) {
 	if (p[i].volumeID) {
-
 	    Volume *vp;
 
+#ifdef AFS_DEMAND_ATTACH_FS
+	    vp = VPreAttachVolumeById_r(&error, p[i].partName, p[i].volumeID);
+	    if (vp) {
+		VCreateReservation_r(vp);
+		VWaitExclusiveState_r(vp);
+		VDeregisterVolOp_r(vp);
+		VCancelReservation_r(vp);
+	    }
+#else
 	    tvolName[0] = OS_DIRSEPC;
 	    sprintf(&tvolName[1], VFORMAT, afs_printable_uint32_lu(p[i].volumeID));
 	    vp = VAttachVolumeByName_r(&error, p[i].partName, tvolName,
 				       V_VOLUPD);
 	    if (vp)
 		VPutVolume_r(vp);
+#endif /* !AFS_DEMAND_ATTACH_FS */
 	    p[i].volumeID = 0;
 	}
     }