diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index 7117bc8d63f..29a6b31e247 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -3070,29 +3070,11 @@ NS_IMETHODIMP nsWebShell::Destroy()
     rv = FireUnloadEvent();
   }
 
-  // Stop any URLs that are currently being loaded...
-  Stop();
-  mDocLoader->Destroy();
+  nsDocShell::Destroy();
 
   SetContainer(nsnull);
-  SetDocLoaderObserver(nsnull);
 
-  // Remove this docshell from its parent's child list
-  nsCOMPtr<nsIDocShellTreeNode> docShellParentAsNode(do_QueryInterface(mParent));
-
-  if (docShellParentAsNode) {
-    docShellParentAsNode->RemoveChild(this);
-  }
-
-  if (nsnull != mDocLoader) {
-    mDocLoader->SetContainer(nsnull);
-  }
-
-  mContentViewer = nsnull;
-
-  // Destroy our child web shells and release references to them
-  DestroyChildren();
-  return rv;
+  return NS_OK;
 }
 
 NS_IMETHODIMP nsWebShell::SetPositionAndSize(PRInt32 x, PRInt32 y, PRInt32 cx,
diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp
index 7117bc8d63f..29a6b31e247 100644
--- a/mozilla/webshell/src/nsWebShell.cpp
+++ b/mozilla/webshell/src/nsWebShell.cpp
@@ -3070,29 +3070,11 @@ NS_IMETHODIMP nsWebShell::Destroy()
     rv = FireUnloadEvent();
   }
 
-  // Stop any URLs that are currently being loaded...
-  Stop();
-  mDocLoader->Destroy();
+  nsDocShell::Destroy();
 
   SetContainer(nsnull);
-  SetDocLoaderObserver(nsnull);
 
-  // Remove this docshell from its parent's child list
-  nsCOMPtr<nsIDocShellTreeNode> docShellParentAsNode(do_QueryInterface(mParent));
-
-  if (docShellParentAsNode) {
-    docShellParentAsNode->RemoveChild(this);
-  }
-
-  if (nsnull != mDocLoader) {
-    mDocLoader->SetContainer(nsnull);
-  }
-
-  mContentViewer = nsnull;
-
-  // Destroy our child web shells and release references to them
-  DestroyChildren();
-  return rv;
+  return NS_OK;
 }
 
 NS_IMETHODIMP nsWebShell::SetPositionAndSize(PRInt32 x, PRInt32 y, PRInt32 cx,