diff --git a/mozilla/xpcom/components/nsComponentManager.cpp b/mozilla/xpcom/components/nsComponentManager.cpp
index f1712d0f1ad..61d96fb792d 100644
--- a/mozilla/xpcom/components/nsComponentManager.cpp
+++ b/mozilla/xpcom/components/nsComponentManager.cpp
@@ -220,8 +220,11 @@ nsresult nsComponentManagerImpl::Init(void)
     PlatformVersionCheck();
 #endif
 
-    // Initiate autoreg
+#if !defined(XP_UNIX)
+    // The below code is being moved out into the applications using using
+    // nsSpecialSystemDirectory platform by platform.
     AutoRegister(NS_Startup, NULL);
+#endif /* !XP_UNIX */
 
     return NS_OK;
 }
@@ -1575,7 +1578,9 @@ nsComponentManagerImpl::AutoRegister(RegistrationTime when,
     {
         SyncComponentsInPathList(pathlist);
     }
-	
+#if !defined(XP_UNIX)
+    // The below code is being moved out into the applications using using
+    // nsSpecialSystemDirectory platform by platform.
 #ifdef	XP_MAC
     // get info for the the current process to determine the directory its located in
     if (!(err = GetCurrentProcess(&psn)))
@@ -1628,6 +1633,7 @@ nsComponentManagerImpl::AutoRegister(RegistrationTime when,
     const char *defaultPathList = "./components";
     SyncComponentsInPathList(defaultPathList);
 #endif
+#endif /* !XP_UNIX */
     return NS_OK;
 }
 
diff --git a/mozilla/xpcom/components/nsComponentManager.h b/mozilla/xpcom/components/nsComponentManager.h
index bbcdbb8a569..eee2314edca 100644
--- a/mozilla/xpcom/components/nsComponentManager.h
+++ b/mozilla/xpcom/components/nsComponentManager.h
@@ -198,7 +198,6 @@ protected:
 #define NS_MOZILLA_DIR_PERMISSION	00700
 #endif /* XP_UNIX */
 
-
 /**
  * When using the registry we put a version number in it.
  * If the version number that is in the registry doesn't match
@@ -209,7 +208,7 @@ protected:
  * alpha0.30 : Changing autoreg to begin registration from ./components on unix
  * alpha0.40 : repository -> component manager
  */
-#define NS_XPCOM_COMPONENT_MANAGER_VERSION_STRING "alpha0.42"
+#define NS_XPCOM_COMPONENT_MANAGER_VERSION_STRING "alpha0.43"
 
 ////////////////////////////////////////////////////////////////////////////////
 /**
diff --git a/mozilla/xpcom/src/nsComponentManager.cpp b/mozilla/xpcom/src/nsComponentManager.cpp
index f1712d0f1ad..61d96fb792d 100644
--- a/mozilla/xpcom/src/nsComponentManager.cpp
+++ b/mozilla/xpcom/src/nsComponentManager.cpp
@@ -220,8 +220,11 @@ nsresult nsComponentManagerImpl::Init(void)
     PlatformVersionCheck();
 #endif
 
-    // Initiate autoreg
+#if !defined(XP_UNIX)
+    // The below code is being moved out into the applications using using
+    // nsSpecialSystemDirectory platform by platform.
     AutoRegister(NS_Startup, NULL);
+#endif /* !XP_UNIX */
 
     return NS_OK;
 }
@@ -1575,7 +1578,9 @@ nsComponentManagerImpl::AutoRegister(RegistrationTime when,
     {
         SyncComponentsInPathList(pathlist);
     }
-	
+#if !defined(XP_UNIX)
+    // The below code is being moved out into the applications using using
+    // nsSpecialSystemDirectory platform by platform.
 #ifdef	XP_MAC
     // get info for the the current process to determine the directory its located in
     if (!(err = GetCurrentProcess(&psn)))
@@ -1628,6 +1633,7 @@ nsComponentManagerImpl::AutoRegister(RegistrationTime when,
     const char *defaultPathList = "./components";
     SyncComponentsInPathList(defaultPathList);
 #endif
+#endif /* !XP_UNIX */
     return NS_OK;
 }
 
diff --git a/mozilla/xpcom/src/nsComponentManager.h b/mozilla/xpcom/src/nsComponentManager.h
index bbcdbb8a569..eee2314edca 100644
--- a/mozilla/xpcom/src/nsComponentManager.h
+++ b/mozilla/xpcom/src/nsComponentManager.h
@@ -198,7 +198,6 @@ protected:
 #define NS_MOZILLA_DIR_PERMISSION	00700
 #endif /* XP_UNIX */
 
-
 /**
  * When using the registry we put a version number in it.
  * If the version number that is in the registry doesn't match
@@ -209,7 +208,7 @@ protected:
  * alpha0.30 : Changing autoreg to begin registration from ./components on unix
  * alpha0.40 : repository -> component manager
  */
-#define NS_XPCOM_COMPONENT_MANAGER_VERSION_STRING "alpha0.42"
+#define NS_XPCOM_COMPONENT_MANAGER_VERSION_STRING "alpha0.43"
 
 ////////////////////////////////////////////////////////////////////////////////
 /**