diff --git a/indra/llui/llmodaldialog.h b/indra/llui/llmodaldialog.h
index c0bdcfb1b2..f81273b96a 100755
--- a/indra/llui/llmodaldialog.h
+++ b/indra/llui/llmodaldialog.h
@@ -77,7 +77,6 @@ private:
 	LLFrameTimer 	mVisibleTime;
 	const BOOL		mModal;
 
-protected: // <FS:Ansariel> FIRE-17439: Need access to stack in derived classes
 	static std::list<LLModalDialog*> sModalStack;  // Top of stack is currently being displayed
 };
 
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index 7feed0e94e..b6b18d1905 100755
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -393,12 +393,6 @@ void LLToast::setVisible(BOOL show)
 		if (!getVisible())
 		{
 			LLModalDialog::setFrontmost(FALSE);
-			// <FS:Ansariel> Properly push the modal toast on the modal dialog stack
-			if (isModal() && std::find(sModalStack.begin(), sModalStack.end(), this) == sModalStack.end())
-			{
-				onOpen(LLSD());
-			}
-			// </FS:Ansariel>
 		}
 	}
 	else
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 7eac5e9f87..eccce66d1f 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2312,20 +2312,13 @@ void LLViewerWindow::shutdownViews()
 	}
 	LL_INFOS() << "Global views cleaned." << LL_ENDL ;
 
-	// <FS:Ansariel> FIRE-17513: Need to shutdown modals first because toasts are derived from LLModalDialog
-	//LLNotificationsUI::LLToast::cleanupToasts();
-	//LL_INFOS() << "Leftover toast cleaned up." << LL_ENDL;
-	// </FS:Ansariel>
+	LLNotificationsUI::LLToast::cleanupToasts();
+	LL_INFOS() << "Leftover toast cleaned up." << LL_ENDL;
 
 	// DEV-40930: Clear sModalStack. Otherwise, any LLModalDialog left open
 	// will crump with LL_ERRS.
 	LLModalDialog::shutdownModals();
 	LL_INFOS() << "LLModalDialog shut down." << LL_ENDL; 
-	
-	// <FS:Ansariel> FIRE-17513: Need to shutdown modals first because toasts are derived from LLModalDialog
-	LLNotificationsUI::LLToast::cleanupToasts();
-	LL_INFOS() << "Leftover toast cleaned up." << LL_ENDL;
-	// </FS:Ansariel>
 
 	// destroy the nav bar, not currently part of gViewerWindow
 	// *TODO: Make LLNavigationBar part of gViewerWindow