diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index b169e85fd5b..4c2eef9cc86 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -325,7 +325,6 @@ nsresult nsWebShell::CreatePluginHost(PRBool aAllowPlugins)
                                                     (void **)&mPluginHost))
         {
           mPluginHost->Init();
-          mPluginHost->LoadPlugins();
         }
       }
     }
@@ -382,10 +381,7 @@ nsWebShell::~nsWebShell()
   NS_IF_RELEASE(mInnerWindow);
 
   NS_IF_RELEASE(mContentViewer);
-  if (nsnull != mDeviceContext) {
-    mDeviceContext->FlushFontCache();
-    NS_RELEASE(mDeviceContext);
-  }
+  NS_IF_RELEASE(mDeviceContext);
   NS_IF_RELEASE(mPrefs);
   NS_IF_RELEASE(mContainer);
   NS_IF_RELEASE(mObserver);
diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp
index b169e85fd5b..4c2eef9cc86 100644
--- a/mozilla/webshell/src/nsWebShell.cpp
+++ b/mozilla/webshell/src/nsWebShell.cpp
@@ -325,7 +325,6 @@ nsresult nsWebShell::CreatePluginHost(PRBool aAllowPlugins)
                                                     (void **)&mPluginHost))
         {
           mPluginHost->Init();
-          mPluginHost->LoadPlugins();
         }
       }
     }
@@ -382,10 +381,7 @@ nsWebShell::~nsWebShell()
   NS_IF_RELEASE(mInnerWindow);
 
   NS_IF_RELEASE(mContentViewer);
-  if (nsnull != mDeviceContext) {
-    mDeviceContext->FlushFontCache();
-    NS_RELEASE(mDeviceContext);
-  }
+  NS_IF_RELEASE(mDeviceContext);
   NS_IF_RELEASE(mPrefs);
   NS_IF_RELEASE(mContainer);
   NS_IF_RELEASE(mObserver);