diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
index 98224158129266f072402447f0eeb71f9a19665a..6c7ed7dd116792827bdc2a8903a169e40b8d5e29 100644
--- a/core/java/src/net/i2p/data/DataHelper.java
+++ b/core/java/src/net/i2p/data/DataHelper.java
@@ -280,8 +280,13 @@ public class DataHelper {
                 String val = line.substring(split+1);   //.trim() ??????????????
                 // Unescape line breaks after loading.
                 // Remember: "\" needs escaping both for regex and string.
-                val = val.replaceAll("\\\\r","\r");
-                val = val.replaceAll("\\\\n","\n");
+
+                // For some reason this was turning \r (one backslash) into CR,
+                // I think it needed one more \\ in the pattern?,
+                // which sucks if your username is randy on DOS,
+                // it was a horrible idea anyway
+                //val = val.replaceAll("\\\\r","\r");
+                //val = val.replaceAll("\\\\n","\n");
                 if ( (key.length() > 0) && (val.length() > 0) )
                     if (forceLowerCase)
                         props.setProperty(key.toLowerCase(), val);
diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index 6c97b2124d13c7f1ca118b145b2efdc23b829d43..77a73f65a7c3c6ab9abe41db20857fa4d4a3094c 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -1053,8 +1053,9 @@ public class Router {
                     String val = _config.getProperty(key);
                     // Escape line breaks before saving.
                     // Remember: "\" needs escaping both for regex and string.
-                    val = val.replaceAll("\\r","\\\\r");
-                    val = val.replaceAll("\\n","\\\\n");
+                    // NOOO - see comments in DataHelper
+                    //val = val.replaceAll("\\r","\\\\r");
+                    //val = val.replaceAll("\\n","\\\\n");
                     buf.append(key).append('=').append(val).append('\n');
                 }
             }