diff --git a/xpcom/base/nsStackWalk.cpp b/xpcom/base/nsStackWalk.cpp
index ec1f65a25f5..d34e385aff4 100644
--- a/xpcom/base/nsStackWalk.cpp
+++ b/xpcom/base/nsStackWalk.cpp
@@ -306,8 +306,6 @@ extern  SYMGETLINEFROMADDRPROC64 _SymGetLineFromAddr64;
 
 extern HANDLE hStackWalkMutex; 
 
-HANDLE GetCurrentPIDorHandle();
-
 bool EnsureSymInitialized();
 
 bool EnsureImageHlpInitialized();
@@ -1072,15 +1070,6 @@ BOOL SymGetModuleInfoEspecial64(HANDLE aProcess, DWORD64 aAddr, PIMAGEHLP_MODULE
 }
 #endif
 
-HANDLE
-GetCurrentPIDorHandle()
-{
-    if (_SymGetModuleBase64)
-        return GetCurrentProcess();  // winxp and friends use process handle
-
-    return (HANDLE) GetCurrentProcessId(); // winme win98 win95 etc use process identifier
-}
-
 bool
 EnsureSymInitialized()
 {
@@ -1096,7 +1085,7 @@ EnsureSymInitialized()
         return false;
 
     _SymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_UNDNAME);
-    retStat = _SymInitialize(GetCurrentPIDorHandle(), NULL, TRUE);
+    retStat = _SymInitialize(GetCurrentProcess(), NULL, TRUE);
     if (!retStat)
         PrintError("SymInitialize");
 
diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp
index 2ce39ca03bc..53dc44ffa66 100644
--- a/xpcom/io/nsAppFileLocationProvider.cpp
+++ b/xpcom/io/nsAppFileLocationProvider.cpp
@@ -355,14 +355,6 @@ NS_METHOD nsAppFileLocationProvider::GetProductDirectory(nsILocalFile **aLocalFi
     if (NS_FAILED(rv)) return rv;
     const char* prop = aLocal ? NS_WIN_LOCAL_APPDATA_DIR : NS_WIN_APPDATA_DIR;
     rv = directoryService->Get(prop, NS_GET_IID(nsILocalFile), getter_AddRefs(localDir));
-    if (NS_SUCCEEDED(rv))
-        rv = localDir->Exists(&exists);
-    if (NS_FAILED(rv) || !exists)
-    {
-        // On some Win95 machines, NS_WIN_APPDATA_DIR does not exist - revert to NS_WIN_WINDOWS_DIR
-        localDir = nsnull;
-        rv = directoryService->Get(NS_WIN_WINDOWS_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(localDir));
-    }
     if (NS_FAILED(rv)) return rv;
 #elif defined(XP_UNIX)
     rv = NS_NewNativeLocalFile(nsDependentCString(PR_GetEnv("HOME")), true, getter_AddRefs(localDir));