diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c
index c223dd3a9e..e8edf2b260 100644
--- a/src/afs/afs_call.c
+++ b/src/afs/afs_call.c
@@ -1259,11 +1259,6 @@ afs_shutdown(void)
     shutdown_daemons();
 #endif
 
-    /* Close file only after daemons which can write to it are stopped. */
-    if (afs_cacheInodep) {	/* memcache won't set this */
-	osi_UFSClose(afs_cacheInodep);	/* Since we always leave it open */
-	afs_cacheInodep = 0;
-    }
 #ifdef notdef
     shutdown_CB();
     shutdown_AFS();
@@ -1272,7 +1267,6 @@ afs_shutdown(void)
     shutdown_rx();
     afs_shutdown_BKG();
 #endif
-    return;
     shutdown_bufferpackage();
     shutdown_cache();
     shutdown_osi();
@@ -1292,6 +1286,13 @@ afs_shutdown(void)
     memset(&afs_stats_cmfullperf, 0, sizeof(struct afs_stats_CMFullPerf));
 */
     afs_warn(" ALL allocated tables\n");
+
+    /* Close file only after daemons which can write to it are stopped. */
+    if (afs_cacheInodep) {	/* memcache won't set this */
+	osi_UFSClose(afs_cacheInodep);	/* Since we always leave it open */
+	afs_cacheInodep = 0;
+    }
+
     afs_shuttingdown = 0;
 
     return;			/* Just kill daemons for now */