diff --git a/mozilla/modules/libreg/xpcom/nsRegistry.cpp b/mozilla/modules/libreg/xpcom/nsRegistry.cpp
index f43af9f4cd9..451579ab4a6 100644
--- a/mozilla/modules/libreg/xpcom/nsRegistry.cpp
+++ b/mozilla/modules/libreg/xpcom/nsRegistry.cpp
@@ -470,11 +470,7 @@ NS_IMETHODIMP nsRegistry::OpenWellKnownRegistry( uint32 regid ) {
         return NS_ERROR_REG_BADTYPE;
     }
 
-    // WARNING:
-    // regNSPRPath and regFile need to have the same scope
-    // since the regFile will point to data in regNSPRPath
-    nsNSPRPath regNSPRPath(*registryLocation);
-    const char *regFile = (const char *) regNSPRPath;
+    const char *regFile = registryLocation->GetNativePathCString();
 
 #ifdef DEBUG_dp
     printf("nsRegistry: Opening std registry %s\n", regFile);
diff --git a/mozilla/profile/src/nsProfile.cpp b/mozilla/profile/src/nsProfile.cpp
index f1054536f2b..f940b2ab3f4 100644
--- a/mozilla/profile/src/nsProfile.cpp
+++ b/mozilla/profile/src/nsProfile.cpp
@@ -2010,11 +2010,7 @@ NS_IMETHODIMP nsProfile::MigrateProfileInfo()
 		*regLocation += "Preferences";
 		*regLocation += oldMacReg;
 		
-		// WARNING
-		// regNSPRPath and regFile need to have the same scope
-		// since the regFile will point to data in regNSPRPath
-        nsNSPRPath regNSPRPath(*regLocation);
-        PL_strcpy(oldRegFile, (const char *) regNSPRPath);
+        PL_strcpy(oldRegFile, regLocation->GetNativePathCString());
 #endif
 		rv = m_reg->Open(oldRegFile);
 
diff --git a/mozilla/xpcom/components/nsRegistry.cpp b/mozilla/xpcom/components/nsRegistry.cpp
index f43af9f4cd9..451579ab4a6 100644
--- a/mozilla/xpcom/components/nsRegistry.cpp
+++ b/mozilla/xpcom/components/nsRegistry.cpp
@@ -470,11 +470,7 @@ NS_IMETHODIMP nsRegistry::OpenWellKnownRegistry( uint32 regid ) {
         return NS_ERROR_REG_BADTYPE;
     }
 
-    // WARNING:
-    // regNSPRPath and regFile need to have the same scope
-    // since the regFile will point to data in regNSPRPath
-    nsNSPRPath regNSPRPath(*registryLocation);
-    const char *regFile = (const char *) regNSPRPath;
+    const char *regFile = registryLocation->GetNativePathCString();
 
 #ifdef DEBUG_dp
     printf("nsRegistry: Opening std registry %s\n", regFile);