diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index 4102edfac49..e28e307a06a 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -67,11 +67,6 @@
 #include "nsIDOMRange.h"
 #include "nsIFrameReflow.h"
 
-#include "nsMultiMixedConv.h"
-#include "nsFTPDirListingConv.h"
-#include "nsIRegistry.h"
-static NS_DEFINE_CID(kRegistryCID,               NS_REGISTRY_CID);
-
 #include "nsILocaleService.h"
 static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID);
 
@@ -1080,56 +1075,6 @@ nsWebShell::Init(nsNativeWidget aNativeParent,
     widgetInit.mWindowType = eWindowType_child;
   }
 
-  // STREAM CONVERTER REGISTRATION
-
-  nsIRegistry *registry;
-  rv = nsServiceManager::GetService(kRegistryCID, NS_GET_IID(nsIRegistry), (nsISupports**) &registry);
-  if (NS_FAILED(rv)) goto done;
-
-
-
-  // open the registry
-  rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
-  if (NS_FAILED(rv)) goto done;
-
-  // set the key
-  nsIRegistry::Key key, key1;
-
-  // root key addition
-  rv = registry->AddSubtree(nsIRegistry::Common, NS_ISTREAMCONVERTER_KEY, &key);
-  if (NS_FAILED(rv)) goto done;
-
-  // multipart mixed converter registration
-  nsIFactory *multiMixedFactSup;
-  rv = nsComponentManager::FindFactory(kMultiMixedConverterCID, &multiMixedFactSup);
-  if (NS_SUCCEEDED(rv)) {
-      rv = nsComponentManager::RegisterFactory(kMultiMixedConverterCID,
-                                             "MultiMixedConverter",
-                                             NS_ISTREAMCONVERTER_KEY "?from=multipart/x-mixed-replace?to=text/html",
-                                             multiMixedFactSup,
-                                             PR_TRUE);
-      if (NS_FAILED(rv)) goto done;
-
-      rv = registry->AddSubtreeRaw(key, "?from=multipart/x-mixed-replace?to=text/html", &key1);
-      if (NS_FAILED(rv)) goto done;
-  }
-
-  // FTP directory listing converter registration
-  nsIFactory *FTPDirListingFactSup;
-  rv = nsComponentManager::FindFactory(kFTPDirListingConverterCID, &FTPDirListingFactSup);
-  if (NS_SUCCEEDED(rv)) {
-      rv = nsComponentManager::RegisterFactory(kFTPDirListingConverterCID,
-                                               "FTPDirListingConverter",
-                                               NS_ISTREAMCONVERTER_KEY "?from=text/ftp-dir-unix?to=application/http-index-format",
-                                               FTPDirListingFactSup,
-                                               PR_TRUE);
-      if (NS_FAILED(rv)) goto done;
-
-      rv = registry->AddSubtreeRaw(key, "?from=text/ftp-dir-unix?to=application/http-index-format", &key1);
-      if (NS_FAILED(rv)) goto done;
-  }
-  // END STREAM CONVERTER REGISTRATION
-
   // Set the language portion of the user agent. :)
   nsILocaleService *localeServ;
   rv = nsServiceManager::GetService(kLocaleServiceCID, NS_GET_IID(nsILocaleService),
diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp
index 4102edfac49..e28e307a06a 100644
--- a/mozilla/webshell/src/nsWebShell.cpp
+++ b/mozilla/webshell/src/nsWebShell.cpp
@@ -67,11 +67,6 @@
 #include "nsIDOMRange.h"
 #include "nsIFrameReflow.h"
 
-#include "nsMultiMixedConv.h"
-#include "nsFTPDirListingConv.h"
-#include "nsIRegistry.h"
-static NS_DEFINE_CID(kRegistryCID,               NS_REGISTRY_CID);
-
 #include "nsILocaleService.h"
 static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID);
 
@@ -1080,56 +1075,6 @@ nsWebShell::Init(nsNativeWidget aNativeParent,
     widgetInit.mWindowType = eWindowType_child;
   }
 
-  // STREAM CONVERTER REGISTRATION
-
-  nsIRegistry *registry;
-  rv = nsServiceManager::GetService(kRegistryCID, NS_GET_IID(nsIRegistry), (nsISupports**) &registry);
-  if (NS_FAILED(rv)) goto done;
-
-
-
-  // open the registry
-  rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
-  if (NS_FAILED(rv)) goto done;
-
-  // set the key
-  nsIRegistry::Key key, key1;
-
-  // root key addition
-  rv = registry->AddSubtree(nsIRegistry::Common, NS_ISTREAMCONVERTER_KEY, &key);
-  if (NS_FAILED(rv)) goto done;
-
-  // multipart mixed converter registration
-  nsIFactory *multiMixedFactSup;
-  rv = nsComponentManager::FindFactory(kMultiMixedConverterCID, &multiMixedFactSup);
-  if (NS_SUCCEEDED(rv)) {
-      rv = nsComponentManager::RegisterFactory(kMultiMixedConverterCID,
-                                             "MultiMixedConverter",
-                                             NS_ISTREAMCONVERTER_KEY "?from=multipart/x-mixed-replace?to=text/html",
-                                             multiMixedFactSup,
-                                             PR_TRUE);
-      if (NS_FAILED(rv)) goto done;
-
-      rv = registry->AddSubtreeRaw(key, "?from=multipart/x-mixed-replace?to=text/html", &key1);
-      if (NS_FAILED(rv)) goto done;
-  }
-
-  // FTP directory listing converter registration
-  nsIFactory *FTPDirListingFactSup;
-  rv = nsComponentManager::FindFactory(kFTPDirListingConverterCID, &FTPDirListingFactSup);
-  if (NS_SUCCEEDED(rv)) {
-      rv = nsComponentManager::RegisterFactory(kFTPDirListingConverterCID,
-                                               "FTPDirListingConverter",
-                                               NS_ISTREAMCONVERTER_KEY "?from=text/ftp-dir-unix?to=application/http-index-format",
-                                               FTPDirListingFactSup,
-                                               PR_TRUE);
-      if (NS_FAILED(rv)) goto done;
-
-      rv = registry->AddSubtreeRaw(key, "?from=text/ftp-dir-unix?to=application/http-index-format", &key1);
-      if (NS_FAILED(rv)) goto done;
-  }
-  // END STREAM CONVERTER REGISTRATION
-
   // Set the language portion of the user agent. :)
   nsILocaleService *localeServ;
   rv = nsServiceManager::GetService(kLocaleServiceCID, NS_GET_IID(nsILocaleService),