diff --git a/browser/components/Makefile.in b/browser/components/Makefile.in
index f3e4b9f3befa..c6b5b92aca20 100644
--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@@ -60,7 +60,6 @@ DIRS = \
 	migration \
 	preferences \
 	search \
-	sessionstore \
 	shell \
 	sidebar \
 	$(NULL)
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index f833720faa20..ab1efa93dd80 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -101,25 +101,6 @@ BrowserGlue.prototype = {
       ww.openWindow(null, "chrome://browser/content/safeMode.xul", 
                     "_blank", "chrome,centerscreen,modal,resizable=no", null);
     }
-    else {
-      // initialize the session-restore service
-      var ssEnabled = true;
-      var prefBranch = Components.classes["@mozilla.org/preferences-service;1"]
-                                 .getService(Components.interfaces.nsIPrefBranch);
-      try {
-        ssEnabled = prefBranch.getBoolPref("browser.sessionstore.enabled");
-      } catch (ex) {}
-
-      if (ssEnabled) {
-        try {
-          var ss = Components.classes["@mozilla.org/browser/sessionstore;1"]
-                             .getService(Components.interfaces.nsISessionStore);
-          ss.init();
-        } catch(ex) {
-          dump("nsSessionStore could not be initialized: " + ex);
-        }
-      }
-    }
   },
 
   // profile shutdown handler (contains profile cleanup routines)
diff --git a/browser/components/sessionstore/src/nsSessionStore.js b/browser/components/sessionstore/src/nsSessionStore.js
index b8c5e917518b..a50ef97fcece 100644
--- a/browser/components/sessionstore/src/nsSessionStore.js
+++ b/browser/components/sessionstore/src/nsSessionStore.js
@@ -110,9 +110,6 @@ const DEFAULT_RESUME_SESSION = false;
 // resume the current session at startup just this once
 const DEFAULT_RESUME_SESSION_ONCE = false;
 
-// resume the current session at startup if it had previously crashed
-const DEFAULT_RESUME_FROM_CRASH = false;
-
 // global notifications observed
 const OBSERVING = [
   "domwindowopened", "domwindowclosed",
@@ -1772,10 +1769,6 @@ SessionStoreService.prototype = {
    * @returns bool
    */
   _doRecoverSession: function sss_doRecoverSession() {
-    // do not prompt or resume, post-crash
-    if (!this._getPref("sessionstore.resume_from_crash", DEFAULT_RESUME_FROM_CRASH))
-      return false;
-
     // if the prompt fails, recover anyway
     var recover = true;
     // allow extensions to hook in a more elaborate restore prompt
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index 84355d8aaac7..e1236a985f52 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -23,7 +23,6 @@
     locale/browser/engineManager.dtd               (%chrome/browser/engineManager.dtd)
     locale/browser/setDesktopBackground.dtd        (%chrome/browser/setDesktopBackground.dtd)
     locale/browser/shellservice.properties         (%chrome/browser/shellservice.properties)
-    locale/browser/sessionstore.properties         (%chrome/browser/sessionstore.properties)
 #ifdef MOZ_PLACES
     locale/browser/places/places.dtd               (%chrome/browser/places/places.dtd)
     locale/browser/places/bookmarkProperties.dtd   (%chrome/browser/places/bookmarkProperties.dtd)