diff --git a/mozilla/browser/components/sessionstore/src/nsSessionStore.js b/mozilla/browser/components/sessionstore/src/nsSessionStore.js
index d1af71c2aaf..013e03170a9 100644
--- a/mozilla/browser/components/sessionstore/src/nsSessionStore.js
+++ b/mozilla/browser/components/sessionstore/src/nsSessionStore.js
@@ -72,7 +72,6 @@ const PRIVACY_FULL = 2;
 const OBSERVING = [
   "domwindowopened", "domwindowclosed",
   "quit-application-requested", "quit-application-granted",
-  "quit-application-roughly", // XXXzeniko work-around for bug 333907
   "quit-application", "browser:purge-session-history"
 ];
 
@@ -283,7 +282,6 @@ SessionStoreService.prototype = {
       this._loadState = STATE_QUITTING;
       break;
     case "quit-application":
-    case "quit-application-roughly":
       if (aData == "restart")
         this._prefBranch.setBoolPref("sessionstore.resume_session_once", true);
       this._loadState = STATE_QUITTING; // just to be sure
diff --git a/mozilla/widget/src/windows/nsWindow.cpp b/mozilla/widget/src/windows/nsWindow.cpp
index 198fa7e4d2b..ebb534a35bf 100644
--- a/mozilla/widget/src/windows/nsWindow.cpp
+++ b/mozilla/widget/src/windows/nsWindow.cpp
@@ -5251,16 +5251,6 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT
       break;
 #endif
 
-    case WM_ENDSESSION:
-      // XXXzeniko allow components to deal with a rough shutdown as long as there's no
-      //           clean fix for bug 333907
-      if (wParam) {
-        nsCOMPtr<nsIObserverService> observerService
-          = do_GetService("@mozilla.org/observer-service;1");
-        if (observerService)
-          observerService->NotifyObservers(nsnull, "quit-application-roughly", nsnull);
-      }
-      break;
 
 #ifdef WINCE
   case WM_HIBERNATE: