diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index e76fe74219..28f0ec4936 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2056,12 +2056,12 @@ bool LLAppViewer::cleanup()
 
     // Give any remaining SLPlugin instances a chance to exit cleanly.
     LLPluginProcessParent::shutdown();
-	// <FS:Beq> [FIRE-32453] [BUG-232971] disconnect sooner to force the cache write.
-	// disconnectViewer();
-	// LLViewerCamera::deleteSingleton();
 
-	// LL_INFOS() << "Viewer disconnected" << LL_ENDL;
-	// </FS:Beq>
+	disconnectViewer();
+	LLViewerCamera::deleteSingleton();
+
+	LL_INFOS() << "Viewer disconnected" << LL_ENDL;
+	
 	if (gKeyboard)
 	{
 		gKeyboard->resetKeys();
@@ -4863,11 +4863,6 @@ void LLAppViewer::removeDumpDir()
 
 void LLAppViewer::forceQuit()
 {
-	// <FS:Beq> [FIRE-32453] [BUG-232971] disconnect sooner to force the cache write.
-	disconnectViewer();
-	LLViewerCamera::deleteSingleton();
-	LL_INFOS() << "Viewer disconnected" << LL_ENDL;
-	// </FS:Beq>
 	LLApp::setQuitting();
 }
 
@@ -6338,12 +6333,7 @@ void LLAppViewer::idleNetwork()
 		}
 	}
 	add(LLStatViewer::NUM_NEW_OBJECTS, gObjectList.mNumNewObjects);
-	// <FS:Beq> [FIRE-32453] [BUG-232971] disconnect sooner to force the cache write.
-	if(gDisconnected)
-	{
-		return;
-	}
-	// </FS:Beq>
+
 	// Retransmit unacknowledged packets.
 	gXferManager->retransmitUnackedPackets();
 	gAssetStorage->checkForTimeouts();
@@ -6372,7 +6362,6 @@ void LLAppViewer::disconnectViewer()
 	{
 		return;
 	}
-	gDisconnected = TRUE;// <FS:Beq> [FIRE-32453] [BUG-232971] disconnect sooner to force the cache write.
 	//
 	// Cleanup after quitting.
 	//
@@ -6455,7 +6444,7 @@ void LLAppViewer::disconnectViewer()
 	LLDestroyClassList::instance().fireCallbacks();
 
 	cleanup_xfer_manager();
-	// gDisconnected = TRUE; // <FS:Beq/> [FIRE-32453] [BUG-232971] disconnect sooner to force the cache write.
+	gDisconnected = TRUE;
 
 	// Pass the connection state to LLUrlEntryParcel not to attempt
 	// parcel info requests while disconnected.