diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index 79e95e9367..99e76891f0 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -2024,7 +2024,7 @@ public class Functions {
             rsp.setHeader("X-Jenkins-Session", Jenkins.SESSION_HASH);
 
             TcpSlaveAgentListener tal = j.tcpSlaveAgentListener;
-            if (tal !=null) {
+            if (tal != null) { // headers used only by deprecated Remoting-based CLI
                 int p = tal.getAdvertisedPort();
                 rsp.setIntHeader("X-Hudson-CLI-Port", p);
                 rsp.setIntHeader("X-Jenkins-CLI-Port", p);
diff --git a/core/src/main/java/hudson/TcpSlaveAgentListener.java b/core/src/main/java/hudson/TcpSlaveAgentListener.java
index 40abc9ee0c..6b41b6dcf1 100644
--- a/core/src/main/java/hudson/TcpSlaveAgentListener.java
+++ b/core/src/main/java/hudson/TcpSlaveAgentListener.java
@@ -66,7 +66,7 @@ import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
 /**
- * Listens to incoming TCP connections from JNLP agents and Remoting CLI.
+ * Listens to incoming TCP connections from JNLP agents and deprecated Remoting-based CLI.
  *
  * <p>
  * Aside from the HTTP endpoint, Jenkins runs {@link TcpSlaveAgentListener} that listens on a TCP socket.
@@ -514,10 +514,10 @@ public final class TcpSlaveAgentListener extends Thread {
     private static final Logger LOGGER = Logger.getLogger(TcpSlaveAgentListener.class.getName());
 
     /**
-     * Host name that we advertise the CLI client to connect to.
+     * Host name that we advertise protocol clients to connect to.
      * This is primarily for those who have reverse proxies in place such that the HTTP host name
-     * and the CLI TCP/IP connection host names are different.
-     *
+     * and the TCP/IP connection host names are different.
+     * (Note: despite the name, this is used for any client, not only deprecated Remoting-based CLI.)
      * TODO: think about how to expose this (including whether this needs to be exposed at all.)
      */
     @SuppressFBWarnings(value = "MS_SHOULD_BE_FINAL", justification = "Accessible via System Groovy Scripts")
@@ -525,11 +525,11 @@ public final class TcpSlaveAgentListener extends Thread {
     public static String CLI_HOST_NAME = SystemProperties.getString(TcpSlaveAgentListener.class.getName()+".hostName");
 
     /**
-     * Port number that we advertise the CLI client to connect to.
+     * Port number that we advertise protocol clients to connect to.
      * This is primarily for the case where the port that Jenkins runs is different from the port
      * that external world should connect to, because of the presence of NAT / port-forwarding / TCP reverse
      * proxy.
-     *
+     * (Note: despite the name, this is used for any client, not only deprecated Remoting-based CLI.)
      * If left to null, fall back to {@link #getPort()}
      *
      * @since 1.611