diff --git a/mozilla/xpcom/ds/nsProperties.cpp b/mozilla/xpcom/ds/nsProperties.cpp
index c0b7f2c6287..e936a2a768f 100644
--- a/mozilla/xpcom/ds/nsProperties.cpp
+++ b/mozilla/xpcom/ds/nsProperties.cpp
@@ -238,12 +238,8 @@ nsPersistentProperties::Load(nsIInputStream *aIn)
   PRInt32  c;
   nsresult ret;
 
-#if 1
-  nsString utf8("UTF-8");
-  ret = NS_NewConverterStream(&mIn, nsnull, aIn, 0, &utf8);
-#else
-  ret = NS_NewConverterStream(&mIn, nsnull, aIn);
-#endif
+  nsString uesc("x-u-escaped");
+  ret = NS_NewConverterStream(&mIn, nsnull, aIn, 0, &uesc);
   if (ret != NS_OK) {
 #ifdef NS_DEBUG
     cout << "NS_NewConverterStream failed" << endl;