diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/MessageWrapper.java b/router/java/src/net/i2p/router/networkdb/kademlia/MessageWrapper.java
index 4b548a99f0ffc1e50bdf1f7a7118094b0a84aaa3..c3a0767294bc07ec4cd6bfe9bd295e291f4b3e22 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/MessageWrapper.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/MessageWrapper.java
@@ -196,7 +196,7 @@ public class MessageWrapper {
      *  @since 0.9.7
      */
     public static OneTimeSession generateSession(RouterContext ctx, long expiration) {
-        return generateSession(ctx, ctx.sessionKeyManager(), expiration, true);
+        return generateSession(ctx, ctx.sessionKeyManager(), expiration, false);
     }
 
     /**
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TestJob.java b/router/java/src/net/i2p/router/tunnel/pool/TestJob.java
index 0195e895924eb9a93b2125a2c39f237876e709a3..faf24d49343a63b4d82023b7474ff14fd2895a6f 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TestJob.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TestJob.java
@@ -123,7 +123,7 @@ class TestJob extends JobImpl {
             // to client. false means don't force AES
             sess = MessageWrapper.generateSession(ctx, _pool.getSettings().getDestination(), testPeriod, false);
         } else {
-            // to router. AES.
+            // to router. AES or ChaCha.
             sess = MessageWrapper.generateSession(ctx, testPeriod);
         }
         if (sess == null) {