diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java
index 005e5304ed..7f538d57d7 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -23,8 +23,10 @@ import java.io.PrintWriter;
 import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 import javax.inject.Inject;
 import javax.management.InstanceNotFoundException;
@@ -46,6 +48,8 @@ import picocli.CommandLine;
 
 import static com.google.common.base.Throwables.getStackTraceAsString;
 import static org.apache.cassandra.io.util.File.WriteMode.APPEND;
+import static org.apache.cassandra.tools.nodetool.PrintPortMixin.PRINT_PORT_LONG;
+import static org.apache.cassandra.tools.nodetool.PrintPortMixin.PRINT_PORT_SHORT;
 import static org.apache.cassandra.utils.LocalizeString.toUpperCaseLocalized;
 
 public class NodeTool
@@ -57,6 +61,20 @@ public class NodeTool
 
     private static final String HISTORYFILE = "nodetool.history";
 
+    /**
+     * Set of subcommand names that accept the {@code -pp/--print-port} options.
+     * These are the commands that declare the option via @Mixin and thus require
+     * relocating the option for backward compatibility in order to be recognized
+     * by picocli when specified before the subcommand name.
+     * <p>
+     * Both calls such as {@code ./nodetool --print-port status}, and
+     * {@code ./nodetool status --print-port} should work as expected.
+     */
+    private static final Set<String> COMMANDS_SUPPORTING_PRINT_PORT_OPTION = Set.of("status", "ring", "netstats",
+                                                                                    "gossipinfo", "getendpoints",
+                                                                                    "failuredetector", "describering",
+                                                                                    "describecluster");
+
     private final INodeProbeFactory nodeProbeFactory;
     private final Output output;
 
@@ -112,7 +130,7 @@ public class NodeTool
                        .setPosixClusteredShortOptionsAllowed(false);
 
             printHistory(args);
-            return commandLine.execute(args);
+            return commandLine.execute(relocatePrintPortOptionsForBackwardCompatibility(args));
         }
         catch (ConfigurationException e)
         {
@@ -220,6 +238,66 @@ public class NodeTool
         output.err.println(getStackTraceAsString(e));
     }
 
+    /**
+     * Rewrites global {@code -pp/--print-port} options that have been moved
+     * to subcommands via @Mixin for backward compatibility. When a user types:
+     * <pre>
+     *   nodetool -pp status
+     *   nodetool --print-port status -r
+     * </pre>
+     * this method rewrites them to:
+     * <pre>
+     *   nodetool status -pp
+     *   nodetool status -r --print-port
+     * </pre>
+     * so that picocli assigns the option to the subcommand that declares it.
+     * <p>
+     * Options that appear after the subcommand name are left untouched:
+     * <pre>
+     *   nodetool status -pp -> unchanged
+     *   nodetool status -pp -r -> unchanged
+     * </pre>
+     */
+    static String[] relocatePrintPortOptionsForBackwardCompatibility(String[] args)
+    {
+        if (args == null || args.length < 2)
+            return args;
+
+        Set<String> relocatable = Set.of(PRINT_PORT_SHORT, PRINT_PORT_LONG);
+
+        int subcommandIdx = -1;
+        for (int i = 0; i < args.length; i++)
+        {
+            if (COMMANDS_SUPPORTING_PRINT_PORT_OPTION.contains(args[i]))
+            {
+                subcommandIdx = i;
+                break;
+            }
+        }
+
+        if (subcommandIdx < 0)
+            return args;
+
+        List<String> before = new ArrayList<>();
+        List<String> toRelocate = new ArrayList<>();
+        for (int i = 0; i < subcommandIdx; i++)
+        {
+            if (relocatable.contains(args[i]))
+                toRelocate.add(args[i]);
+            else
+                before.add(args[i]);
+        }
+
+        if (toRelocate.isEmpty())
+            return args;
+
+        List<String> result = new ArrayList<>(before);
+        result.addAll(Arrays.asList(args).subList(subcommandIdx, args.length));
+        result.addAll(toRelocate);
+
+        return result.toArray(new String[0]);
+    }
+
     private enum CliLayout
     {
         AIRLINE,
diff --git a/src/java/org/apache/cassandra/tools/nodetool/DescribeCluster.java b/src/java/org/apache/cassandra/tools/nodetool/DescribeCluster.java
index a045dfa605..448d62a94a 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/DescribeCluster.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/DescribeCluster.java
@@ -31,14 +31,18 @@ import org.apache.cassandra.locator.LocationInfoMBean;
 import org.apache.cassandra.tools.NodeProbe;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 
 @Command(name = "describecluster", description = "Print the name, snitch, partitioner and schema version of a cluster")
-public class DescribeCluster extends WithPortDisplayAbstractCommand
+public class DescribeCluster extends AbstractCommand
 {
     private boolean resolveIp = false;
     private String keyspace = null;
     private Collection<String> joiningNodes, leavingNodes, movingNodes, liveNodes, unreachableNodes;
 
+    @Mixin
+    private PrintPortMixin printPortMixin = new PrintPortMixin();
+
     @Override
     public void execute(NodeProbe probe)
     {
@@ -63,7 +67,7 @@ public class DescribeCluster extends WithPortDisplayAbstractCommand
 
         // display schema version for each node
         out.println("\tSchema versions:");
-        Map<String, List<String>> schemaVersions = printPort ? probe.getSpProxy().getSchemaVersionsWithPort() : probe.getSpProxy().getSchemaVersions();
+        Map<String, List<String>> schemaVersions = printPortMixin.printPort ? probe.getSpProxy().getSchemaVersionsWithPort() : probe.getSpProxy().getSchemaVersions();
         for (Map.Entry<String, List<String>> entry : schemaVersions.entrySet())
         {
             out.printf("\t\t%s: %s%n%n", entry.getKey(), entry.getValue());
diff --git a/src/java/org/apache/cassandra/tools/nodetool/DescribeRing.java b/src/java/org/apache/cassandra/tools/nodetool/DescribeRing.java
index fd2ca386ad..21c943578a 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/DescribeRing.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/DescribeRing.java
@@ -23,16 +23,20 @@ import java.io.PrintStream;
 import org.apache.cassandra.tools.NodeProbe;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Parameters;
 
 import static org.apache.commons.lang3.StringUtils.EMPTY;
 
 @Command(name = "describering", description = "Shows the token ranges info of a given keyspace")
-public class DescribeRing extends WithPortDisplayAbstractCommand
+public class DescribeRing extends AbstractCommand
 {
     @Parameters(description = "The keyspace name", arity = "1")
     private String keyspace = EMPTY;
 
+    @Mixin
+    private PrintPortMixin printPortMixin = new PrintPortMixin();
+
     @Override
     public void execute(NodeProbe probe)
     {
@@ -41,7 +45,7 @@ public class DescribeRing extends WithPortDisplayAbstractCommand
         out.println("TokenRange: ");
         try
         {
-            for (String tokenRangeString : probe.describeRing(keyspace, printPort))
+            for (String tokenRangeString : probe.describeRing(keyspace, printPortMixin.printPort))
             {
                 out.println("\t" + tokenRangeString);
             }
diff --git a/src/java/org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java b/src/java/org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java
index f24feccc01..addbe5a8d0 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java
@@ -25,14 +25,18 @@ import javax.management.openmbean.TabularData;
 import org.apache.cassandra.tools.NodeProbe;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 
 @Command(name = "failuredetector", description = "Shows the failure detector information for the cluster")
-public class FailureDetectorInfo extends WithPortDisplayAbstractCommand
+public class FailureDetectorInfo extends AbstractCommand
 {
+    @Mixin
+    private PrintPortMixin printPortMixin = new PrintPortMixin();
+
     @Override
     public void execute(NodeProbe probe)
     {
-        TabularData data = probe.getFailureDetectorPhilValues(printPort);
+        TabularData data = probe.getFailureDetectorPhilValues(printPortMixin.printPort);
         probe.output().out.printf("%10s,%16s%n", "Endpoint", "Phi");
         for (Object o : data.keySet())
         {
diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java b/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java
index b83a06e217..3f30680951 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java
@@ -25,13 +25,14 @@ import org.apache.cassandra.tools.NodeProbe;
 import org.apache.cassandra.tools.nodetool.layout.CassandraUsage;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Parameters;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs;
 
 @Command(name = "getendpoints", description = "Print the end points that owns the key")
-public class GetEndpoints extends WithPortDisplayAbstractCommand
+public class GetEndpoints extends AbstractCommand
 {
     @CassandraUsage(usage = "<keyspace> <table> <key>", description = "The keyspace, the table, and the partition key for which we need to find the endpoint")
     private List<String> args = new ArrayList<>();
@@ -45,6 +46,9 @@ public class GetEndpoints extends WithPortDisplayAbstractCommand
     @Parameters(index = "2", arity = "0..1", description = "The partition key for which we need to find the endpoint")
     private String key;
 
+    @Mixin
+    private PrintPortMixin printPortMixin = new PrintPortMixin();
+
     @Override
     public void execute(NodeProbe probe)
     {
@@ -55,7 +59,7 @@ public class GetEndpoints extends WithPortDisplayAbstractCommand
         String table = args.get(1);
         String key = args.get(2);
 
-        if (printPort)
+        if (printPortMixin.printPort)
         {
             for (String endpoint : probe.getEndpointsWithPort(ks, table, key))
             {
diff --git a/src/java/org/apache/cassandra/tools/nodetool/GossipInfo.java b/src/java/org/apache/cassandra/tools/nodetool/GossipInfo.java
index a75b3b7abd..94ae46b9ad 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/GossipInfo.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/GossipInfo.java
@@ -20,17 +20,21 @@ package org.apache.cassandra.tools.nodetool;
 import org.apache.cassandra.tools.NodeProbe;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
 
 @Command(name = "gossipinfo", description = "Shows the gossip information for the cluster")
-public class GossipInfo extends WithPortDisplayAbstractCommand
+public class GossipInfo extends AbstractCommand
 {
     @Option(paramLabel = "resolve_ip", names = { "-r", "--resolve-ip" }, description = "Show node domain names instead of IPs")
     private boolean resolveIp = false;
 
+    @Mixin
+    private PrintPortMixin printPortMixin = new PrintPortMixin();
+
     @Override
     public void execute(NodeProbe probe)
     {
-        probe.output().out.println(probe.getGossipInfo(printPort, resolveIp));
+        probe.output().out.println(probe.getGossipInfo(printPortMixin.printPort, resolveIp));
     }
 }
diff --git a/src/java/org/apache/cassandra/tools/nodetool/NetStats.java b/src/java/org/apache/cassandra/tools/nodetool/NetStats.java
index 0399030315..7ed689c1ed 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/NetStats.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/NetStats.java
@@ -31,16 +31,20 @@ import org.apache.cassandra.streaming.StreamState;
 import org.apache.cassandra.tools.NodeProbe;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
 
 @Command(name = "netstats", description = "Print network information on provided host (connecting node by default)")
-public class NetStats extends WithPortDisplayAbstractCommand
+public class NetStats extends AbstractCommand
 {
     @Option(paramLabel = "human_readable",
             names = { "-H", "--human-readable" },
             description = "Display bytes in human readable form, i.e. KiB, MiB, GiB, TiB")
     private boolean humanReadable = false;
 
+    @Mixin
+    private PrintPortMixin printPortMixin = new PrintPortMixin();
+
     @Override
     public void execute(NodeProbe probe)
     {
@@ -54,11 +58,11 @@ public class NetStats extends WithPortDisplayAbstractCommand
             out.printf("%s %s%n", status.streamOperation.getDescription(), status.planId.toString());
             for (SessionInfo info : status.sessions)
             {
-                out.printf("    %s", InetAddressAndPort.toString(info.peer, printPort));
+                out.printf("    %s", InetAddressAndPort.toString(info.peer, printPortMixin.printPort));
                 // print private IP when it is used
                 if (!info.peer.equals(info.connecting))
                 {
-                    out.printf(" (using %s)", InetAddressAndPort.toString(info.connecting, printPort));
+                    out.printf(" (using %s)", InetAddressAndPort.toString(info.connecting, printPortMixin.printPort));
                 }
                 out.printf("%n");
                 if (!info.receivingSummaries.isEmpty())
@@ -142,7 +146,7 @@ public class NetStats extends WithPortDisplayAbstractCommand
 
         for (ProgressInfo progress : info.getReceivingFiles())
         {
-            out.printf("            %s%n", progress.toString(printPort));
+            out.printf("            %s%n", progress.toString(printPortMixin.printPort));
         }
     }
 
@@ -166,7 +170,7 @@ public class NetStats extends WithPortDisplayAbstractCommand
 
         for (ProgressInfo progress : info.getSendingFiles())
         {
-            out.printf("            %s%n", progress.toString(printPort));
+            out.printf("            %s%n", progress.toString(printPortMixin.printPort));
         }
     }
 }
diff --git a/src/java/org/apache/cassandra/tools/nodetool/NodetoolCommand.java b/src/java/org/apache/cassandra/tools/nodetool/NodetoolCommand.java
index 33292b2483..af1e835d91 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/NodetoolCommand.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/NodetoolCommand.java
@@ -20,7 +20,6 @@ package org.apache.cassandra.tools.nodetool;
 
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Model.CommandSpec;
-import picocli.CommandLine.Option;
 import picocli.CommandLine.Spec;
 
 import static org.apache.cassandra.tools.nodetool.Help.printTopCommandUsage;
@@ -61,6 +60,7 @@ import static org.apache.cassandra.tools.nodetool.Help.printTopCommandUsage;
                          AccordAdmin.class,
                          AlterTopology.class,
                          Assassinate.class,
+                         AsyncProfileCommandGroup.class,
                          AutoRepairStatus.class,
                          Bootstrap.class,
                          CIDRFilteringStats.class,
@@ -71,6 +71,7 @@ import static org.apache.cassandra.tools.nodetool.Help.printTopCommandUsage;
                          Compact.class,
                          CompactionHistory.class,
                          CompactionStats.class,
+                         CompressionDictionaryCommandGroup.class,
                          ConsensusMigrationAdmin.class,
                          DataPaths.class,
                          Decommission.Abort.class,
@@ -149,7 +150,6 @@ import static org.apache.cassandra.tools.nodetool.Help.printTopCommandUsage;
                          NetStats.class,
                          PauseHandoff.class,
                          ProfileLoad.class,
-                         AsyncProfileCommandGroup.class,
                          ProxyHistograms.class,
                          RangeKeySample.class,
                          Rebuild.class,
@@ -208,7 +208,6 @@ import static org.apache.cassandra.tools.nodetool.Help.printTopCommandUsage;
                          TableStats.class,
                          TopPartitions.class,
                          TpStats.class,
-                         CompressionDictionaryCommandGroup.class,
                          TruncateHints.class,
                          UpdateCIDRGroup.class,
                          UpgradeSSTable.class,
@@ -220,12 +219,6 @@ public class NodetoolCommand implements Runnable
     @Spec
     public CommandSpec spec;
 
-    // TODO CASSANDRA-20790 this option is used only in several commands and should not be the global option.
-    //  It should be pushed down to specific commands to clean up the global hierarchy, while maintaining backwards compatibility.
-    //  Calls such as './nodetool --print-port subcommand', and './nodetool subcommand --print-port' should work as expected.
-    @Option(names = { "-pp", "--print-port" }, description = "Operate in 4.0 mode with hosts disambiguated by port number")
-    public boolean printPort = false;
-
     public void run()
     {
         printTopCommandUsage(spec.commandLine(),
diff --git a/src/java/org/apache/cassandra/tools/nodetool/WithPortDisplayAbstractCommand.java b/src/java/org/apache/cassandra/tools/nodetool/PrintPortMixin.java
similarity index 62%
rename from src/java/org/apache/cassandra/tools/nodetool/WithPortDisplayAbstractCommand.java
rename to src/java/org/apache/cassandra/tools/nodetool/PrintPortMixin.java
index fe67f126f3..22daf43bd0 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/WithPortDisplayAbstractCommand.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/PrintPortMixin.java
@@ -18,23 +18,14 @@
 
 package org.apache.cassandra.tools.nodetool;
 
-import picocli.CommandLine.ParentCommand;
+import picocli.CommandLine;
 
-/**
- * Abstract class for commands that display endpoints that can be disambiguated by port number. (e.g. gossipinfo, describecluster etc.).
- */
-abstract class WithPortDisplayAbstractCommand extends AbstractCommand
+public class PrintPortMixin
 {
-    @ParentCommand
-    private NodetoolCommand parent;
+    public static final String PRINT_PORT_SHORT = "-pp";
+    public static final String PRINT_PORT_LONG = "--print-port";
 
-    /** See {@link NodetoolCommand#printPort} option. */
-    protected boolean printPort;
-
-    @Override
-    protected boolean shouldConnect()
-    {
-        printPort = parent.printPort;
-        return true;
-    }
+    @CommandLine.Option(names = { PRINT_PORT_SHORT, PRINT_PORT_LONG },
+                        description = "Operate in 4.0 mode with hosts disambiguated by port number")
+    public boolean printPort = false;
 }
diff --git a/src/java/org/apache/cassandra/tools/nodetool/RemoveNode.java b/src/java/org/apache/cassandra/tools/nodetool/RemoveNode.java
index f827a37888..9ab4cc2550 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/RemoveNode.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/RemoveNode.java
@@ -20,9 +20,9 @@ package org.apache.cassandra.tools.nodetool;
 import org.apache.cassandra.tools.NodeProbe;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.Parameters;
-import picocli.CommandLine.ParentCommand;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
@@ -31,9 +31,6 @@ import static com.google.common.base.Preconditions.checkArgument;
          subcommands = { RemoveNode.Status.class })
 public class RemoveNode extends AbstractCommand
 {
-    @ParentCommand
-    public NodetoolCommand parent;
-
     @Parameters(paramLabel = "nodeId", description = "The ID of the node to remove", arity = "0..1")
     private String nodeId;
 
@@ -64,13 +61,13 @@ public class RemoveNode extends AbstractCommand
     @Command(name = "status", description = "Show status of the current node removal operation")
     public static class Status extends AbstractCommand
     {
-        @ParentCommand
-        private RemoveNode parent;
+        @Mixin
+        private PrintPortMixin printPortMixin = new PrintPortMixin();
 
         @Override
         public void execute(NodeProbe probe)
         {
-            probe.output().out.println("RemovalStatus: " + probe.getRemovalStatus(parent.parent.printPort));
+            probe.output().out.println("RemovalStatus: " + probe.getRemovalStatus(printPortMixin.printPort));
         }
     }
 }
diff --git a/src/java/org/apache/cassandra/tools/nodetool/Ring.java b/src/java/org/apache/cassandra/tools/nodetool/Ring.java
index 15964525da..6e8a59a8d4 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/Ring.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/Ring.java
@@ -34,13 +34,14 @@ import org.apache.cassandra.locator.EndpointSnitchInfoMBean;
 import org.apache.cassandra.tools.NodeProbe;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.Parameters;
 
 import static java.lang.String.format;
 
 @Command(name = "ring", description = "Print information about the token ring")
-public class Ring extends WithPortDisplayAbstractCommand
+public class Ring extends AbstractCommand
 {
     @Parameters(description = "Specify a keyspace for accurate ownership information (topology awareness)", index = "0", arity = "0..1")
     private String keyspace = null;
@@ -48,6 +49,9 @@ public class Ring extends WithPortDisplayAbstractCommand
     @Option(paramLabel = "resolve_ip", names = { "-r", "--resolve-ip" }, description = "Show node domain names instead of IPs")
     private boolean resolveIp = false;
 
+    @Mixin
+    private PrintPortMixin printPortMixin = new PrintPortMixin();
+
     private PrintStream out;
     private EndpointSnitchInfoMBean epSnitchInfo;
     private Collection<String> liveNodes, deadNodes, joiningNodes, leavingNodes, movingNodes;
@@ -176,7 +180,7 @@ public class Ring extends WithPortDisplayAbstractCommand
 
             String load = loadMap.getOrDefault(endpoint, "?");
             String owns = stat.owns != null && showEffectiveOwnership? new DecimalFormat("##0.00%").format(stat.owns) : "?";
-            out.printf(format, stat.ipOrDns(printPort), rack, status, state, load, owns, stat.token);
+            out.printf(format, stat.ipOrDns(printPortMixin.printPort), rack, status, state, load, owns, stat.token);
         }
         out.println();
     }
diff --git a/src/java/org/apache/cassandra/tools/nodetool/Status.java b/src/java/org/apache/cassandra/tools/nodetool/Status.java
index a0312aeed8..17083bc7a5 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/Status.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/Status.java
@@ -44,13 +44,14 @@ import org.apache.cassandra.tools.nodetool.formatter.TableBuilder;
 import org.apache.cassandra.utils.LocalizeString;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.Parameters;
 
 import static java.util.stream.Collectors.toMap;
 
 @Command(name = "status", description = "Print cluster information (state, load, IDs, ...)")
-public class Status extends WithPortDisplayAbstractCommand
+public class Status extends AbstractCommand
 {
     @Parameters(description = "The keyspace name", arity = "0..1")
     private String keyspace = null;
@@ -71,6 +72,9 @@ public class Status extends WithPortDisplayAbstractCommand
             description = "Sorting order: 'asc' for ascending, 'desc' for descending.")
     private SortOrder sortOrder = null;
 
+    @Mixin
+    private PrintPortMixin printPortMixin = new PrintPortMixin();
+
     private boolean isTokenPerNode = true;
     private Collection<String> joiningNodes, leavingNodes, movingNodes, liveNodes, unreachableNodes;
     private Map<String, String> loadMap, hostIDMap;
@@ -167,7 +171,7 @@ public class Status extends WithPortDisplayAbstractCommand
                 List<HostStatWithPort> tokens = hostToTokens.get(endpoint);
 
                 HostStatWithPort hostStatWithPort = tokens.get(0);
-                String epDns = hostStatWithPort.ipOrDns(printPort);
+                String epDns = hostStatWithPort.ipOrDns(printPortMixin.printPort);
                 List<Object> nodeData = addNode(epDns, endpoint, owns, hostStatWithPort, tokens.size(), hasEffectiveOwns);
                 data.put(epDns, nodeData);
             }
diff --git a/test/distributed/org/apache/cassandra/distributed/test/GetEndpointsTest.java b/test/distributed/org/apache/cassandra/distributed/test/GetEndpointsTest.java
index c9c00719e5..214d6f698f 100644
--- a/test/distributed/org/apache/cassandra/distributed/test/GetEndpointsTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/test/GetEndpointsTest.java
@@ -33,6 +33,7 @@ import org.apache.cassandra.tcm.ClusterMetadata;
 import org.apache.cassandra.tools.ToolRunner;
 import org.apache.cassandra.utils.FBUtilities;
 
+import static org.apache.cassandra.tools.nodetool.PrintPortMixin.PRINT_PORT_SHORT;
 import static org.junit.Assert.assertEquals;
 
 public class GetEndpointsTest extends TestBaseImpl
@@ -45,7 +46,7 @@ public class GetEndpointsTest extends TestBaseImpl
         {
             for (IInvokableInstance i : cluster)
             {
-                ToolRunner.ToolResult tool = ToolRunner.invokeNodetoolJvmDtestIsolated(i, "-pp", "getendpoints", "system", "compaction_history", "7d431310-43c9-11ef-bd50-53ff742309a9");
+                ToolRunner.ToolResult tool = ToolRunner.invokeNodetoolJvmDtestIsolated(i, PRINT_PORT_SHORT, "getendpoints", "system", "compaction_history", "7d431310-43c9-11ef-bd50-53ff742309a9");
                 tool.asserts().success();
                 List<String> endpoints = tool.getStdout().trim().lines().collect(Collectors.toList());
                 assertEquals(1, endpoints.size());
@@ -64,13 +65,13 @@ public class GetEndpointsTest extends TestBaseImpl
             ToolRunner.ToolResult tool;
             for (IInvokableInstance i : cluster)
             {
-                tool = ToolRunner.invokeNodetoolJvmDtestIsolated(i, "-pp", "getendpoints", "system", "local_metadata_log", "1");
+                tool = ToolRunner.invokeNodetoolJvmDtestIsolated(i, PRINT_PORT_SHORT, "getendpoints", "system", "local_metadata_log", "1");
                 tool.asserts().success();
                 List<String> systemKsEndpoints = tool.getStdout().trim().lines().collect(Collectors.toList());
                 assertEquals(1, systemKsEndpoints.size());
                 i.runOnInstance(() -> assertEquals(FBUtilities.getBroadcastAddressAndPort().getHostAddressAndPort(), systemKsEndpoints.get(0)));
 
-                tool = ToolRunner.invokeNodetoolJvmDtestIsolated(i, "-pp", "getendpoints", "system_cluster_metadata", "distributed_metadata_log", "1");
+                tool = ToolRunner.invokeNodetoolJvmDtestIsolated(i, PRINT_PORT_SHORT, "getendpoints", "system_cluster_metadata", "distributed_metadata_log", "1");
                 tool.asserts().success();
                 List<String> scmEndpoints = tool.getStdout().trim().lines().collect(Collectors.toList());
                 assertEquals(1, scmEndpoints.size());
diff --git a/test/resources/nodetool/help/abortbootstrap b/test/resources/nodetool/help/abortbootstrap
index d8ff26cb8c..29ed7b5248 100644
--- a/test/resources/nodetool/help/abortbootstrap
+++ b/test/resources/nodetool/help/abortbootstrap
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] abortbootstrap [--ip <ip>]
                 [--node <node_id>]
@@ -21,9 +21,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/abortdecommission b/test/resources/nodetool/help/abortdecommission
index abbdddcf0d..6cb5ab860c 100644
--- a/test/resources/nodetool/help/abortdecommission
+++ b/test/resources/nodetool/help/abortdecommission
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] abortdecommission
                 [--node <nodeId>]
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/abortmove b/test/resources/nodetool/help/abortmove
index 685864b839..30f300c56b 100644
--- a/test/resources/nodetool/help/abortmove
+++ b/test/resources/nodetool/help/abortmove
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] abortmove [--node <nodeId>]
 
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/abortremovenode b/test/resources/nodetool/help/abortremovenode
index bb295a09ba..5d8693ca6c 100644
--- a/test/resources/nodetool/help/abortremovenode
+++ b/test/resources/nodetool/help/abortremovenode
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] abortremovenode
                 [--node <nodeId>]
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/accord b/test/resources/nodetool/help/accord
index 49045d6206..4afbc001e8 100644
--- a/test/resources/nodetool/help/accord
+++ b/test/resources/nodetool/help/accord
@@ -3,23 +3,23 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] accord <command> [<args>]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] accord describe
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] accord mark_stale [--]
                 <nodeIds>
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] accord mark_rejoining [--]
                 <nodeIds>
@@ -31,9 +31,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/accord$describe b/test/resources/nodetool/help/accord$describe
index d46c1ee0e3..8322d58992 100644
--- a/test/resources/nodetool/help/accord$describe
+++ b/test/resources/nodetool/help/accord$describe
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] accord describe
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/accord$mark_rejoining b/test/resources/nodetool/help/accord$mark_rejoining
index e595b7d761..160b3c4f72 100644
--- a/test/resources/nodetool/help/accord$mark_rejoining
+++ b/test/resources/nodetool/help/accord$mark_rejoining
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] accord mark_rejoining [--]
                 <nodeIds>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/accord$mark_stale b/test/resources/nodetool/help/accord$mark_stale
index 67747662f8..10b8fa48c9 100644
--- a/test/resources/nodetool/help/accord$mark_stale
+++ b/test/resources/nodetool/help/accord$mark_stale
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] accord mark_stale [--]
                 <nodeIds>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/altertopology b/test/resources/nodetool/help/altertopology
index db81f300d6..4edb71202c 100644
--- a/test/resources/nodetool/help/altertopology
+++ b/test/resources/nodetool/help/altertopology
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] altertopology [--] <args>
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/assassinate b/test/resources/nodetool/help/assassinate
index 1f0f0c2f48..70141f55b0 100644
--- a/test/resources/nodetool/help/assassinate
+++ b/test/resources/nodetool/help/assassinate
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] assassinate [--] <ip_address>
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/autorepairstatus b/test/resources/nodetool/help/autorepairstatus
index 796d0986b0..68fd9c92d7 100644
--- a/test/resources/nodetool/help/autorepairstatus
+++ b/test/resources/nodetool/help/autorepairstatus
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] autorepairstatus
                 [(-t <repairType> | --repair-type <repairType>)]
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/bootstrap b/test/resources/nodetool/help/bootstrap
index 8494acae71..bf905d13da 100644
--- a/test/resources/nodetool/help/bootstrap
+++ b/test/resources/nodetool/help/bootstrap
@@ -3,12 +3,12 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] bootstrap <command> [<args>]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] bootstrap resume
                 [(-f | --force)]
@@ -20,9 +20,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/bootstrap$resume b/test/resources/nodetool/help/bootstrap$resume
index b71617143d..c4d852a24b 100644
--- a/test/resources/nodetool/help/bootstrap$resume
+++ b/test/resources/nodetool/help/bootstrap$resume
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] bootstrap resume
                 [(-f | --force)]
@@ -20,9 +20,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/cidrfilteringstats b/test/resources/nodetool/help/cidrfilteringstats
index f66234b01b..6333cd4b2c 100644
--- a/test/resources/nodetool/help/cidrfilteringstats
+++ b/test/resources/nodetool/help/cidrfilteringstats
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cidrfilteringstats
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/cleanup b/test/resources/nodetool/help/cleanup
index 965e474c69..78b1dd0d9e 100644
--- a/test/resources/nodetool/help/cleanup
+++ b/test/resources/nodetool/help/cleanup
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cleanup
                 [(-j <jobs> | --jobs <jobs>)] [--] [<keyspace> <tables>...]
@@ -20,9 +20,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/clearsnapshot b/test/resources/nodetool/help/clearsnapshot
index 03c462ccb7..761c46c823 100644
--- a/test/resources/nodetool/help/clearsnapshot
+++ b/test/resources/nodetool/help/clearsnapshot
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] clearsnapshot [--all]
                 [--older-than <older_than>]
@@ -28,9 +28,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/clientstats b/test/resources/nodetool/help/clientstats
index d65c4208a8..ef63b7b471 100644
--- a/test/resources/nodetool/help/clientstats
+++ b/test/resources/nodetool/help/clientstats
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] clientstats [--all]
                 [--by-protocol] [--clear-history] [--client-options] [--verbose]
@@ -27,9 +27,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/cms b/test/resources/nodetool/help/cms
index d81b8f3570..7cfc82c1c0 100644
--- a/test/resources/nodetool/help/cms
+++ b/test/resources/nodetool/help/cms
@@ -3,57 +3,57 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms <command> [<args>]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms describe
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms initialize
                 [(-i <ignored_endpoints> | --ignore <ignored_endpoints>)...]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms reconfigure
                 [(-c | --cancel)] [(-r | --resume)] [--status] [--] [<replication
                 factor>] or <datacenter>:<replication_factor> ...
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms snapshot
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms unregister [--] <nodeId>
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms abortinitialization
                 [--initiator <initiator>]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms dumpdirectory [--tokens]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms dumplog
                 [--end <endEpoch>] [--start <startEpoch>]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms resumedropaccordtable
                 [--] <tableId>
@@ -65,9 +65,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/cms$abortinitialization b/test/resources/nodetool/help/cms$abortinitialization
index 57c4a22ea3..6b40d76e37 100644
--- a/test/resources/nodetool/help/cms$abortinitialization
+++ b/test/resources/nodetool/help/cms$abortinitialization
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms abortinitialization
                 [--initiator <initiator>]
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/cms$describe b/test/resources/nodetool/help/cms$describe
index 877c48c294..a0e2cae17e 100644
--- a/test/resources/nodetool/help/cms$describe
+++ b/test/resources/nodetool/help/cms$describe
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms describe
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/cms$dumpdirectory b/test/resources/nodetool/help/cms$dumpdirectory
index 8038cc5ed0..16984d5045 100644
--- a/test/resources/nodetool/help/cms$dumpdirectory
+++ b/test/resources/nodetool/help/cms$dumpdirectory
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms dumpdirectory [--tokens]
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/cms$dumplog b/test/resources/nodetool/help/cms$dumplog
index 9ef81da039..7379be0d0b 100644
--- a/test/resources/nodetool/help/cms$dumplog
+++ b/test/resources/nodetool/help/cms$dumplog
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms dumplog
                 [--end <endEpoch>] [--start <startEpoch>]
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/cms$initialize b/test/resources/nodetool/help/cms$initialize
index 76e193fa29..5a67b84042 100644
--- a/test/resources/nodetool/help/cms$initialize
+++ b/test/resources/nodetool/help/cms$initialize
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms initialize
                 [(-i <ignored_endpoints> | --ignore <ignored_endpoints>)...]
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/cms$reconfigure b/test/resources/nodetool/help/cms$reconfigure
index 437ec20bc8..0895f68cf3 100644
--- a/test/resources/nodetool/help/cms$reconfigure
+++ b/test/resources/nodetool/help/cms$reconfigure
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms reconfigure
                 [(-c | --cancel)] [(-r | --resume)] [--status] [--] [<replication
@@ -19,9 +19,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/cms$resumedropaccordtable b/test/resources/nodetool/help/cms$resumedropaccordtable
index b65601e59a..f87126e8d4 100644
--- a/test/resources/nodetool/help/cms$resumedropaccordtable
+++ b/test/resources/nodetool/help/cms$resumedropaccordtable
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms resumedropaccordtable
                 [--] <tableId>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/cms$snapshot b/test/resources/nodetool/help/cms$snapshot
index ca43b6ade8..4dda0ad415 100644
--- a/test/resources/nodetool/help/cms$snapshot
+++ b/test/resources/nodetool/help/cms$snapshot
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms snapshot
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/cms$unregister b/test/resources/nodetool/help/cms$unregister
index 75dbb65323..6375edeb57 100644
--- a/test/resources/nodetool/help/cms$unregister
+++ b/test/resources/nodetool/help/cms$unregister
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms unregister [--] <nodeId>
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/compact b/test/resources/nodetool/help/compact
index 897e758e6b..3a3f839d80 100644
--- a/test/resources/nodetool/help/compact
+++ b/test/resources/nodetool/help/compact
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compact
                 [(-et <end_token> | --end-token <end_token>)]
@@ -34,9 +34,6 @@ OPTIONS
         --partition <partition_key>
             String representation of the partition key
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/compactionhistory b/test/resources/nodetool/help/compactionhistory
index fab1212232..e5868dcd41 100644
--- a/test/resources/nodetool/help/compactionhistory
+++ b/test/resources/nodetool/help/compactionhistory
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compactionhistory
                 [(-F <format> | --format <format>)] [(-H | --human-readable)]
@@ -21,9 +21,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/compactionstats b/test/resources/nodetool/help/compactionstats
index 6716af175a..089c30dec3 100644
--- a/test/resources/nodetool/help/compactionstats
+++ b/test/resources/nodetool/help/compactionstats
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compactionstats
                 [(-H | --human-readable)] [(-V | --vtable)]
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/compressiondictionary b/test/resources/nodetool/help/compressiondictionary
index 52648bf1bc..a08701f98f 100644
--- a/test/resources/nodetool/help/compressiondictionary
+++ b/test/resources/nodetool/help/compressiondictionary
@@ -3,13 +3,13 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary
                 <command> [<args>]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary train
                 [(-f | --force)] [--max-dict-size <trainingMaxDictionarySize>]
@@ -17,25 +17,25 @@ SYNOPSIS
                 <table>
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary list
                 [--] <keyspace> <table>
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary export
                 [(-i <dictId> | --id <dictId>)] [--] <keyspace> <table> <dictionaryPath>
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary import
                 [--] <dictionaryPath>
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary cleanup
                 [(-d | --dry)]
@@ -47,9 +47,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/compressiondictionary$cleanup b/test/resources/nodetool/help/compressiondictionary$cleanup
index 6fae13d218..b836daa445 100644
--- a/test/resources/nodetool/help/compressiondictionary$cleanup
+++ b/test/resources/nodetool/help/compressiondictionary$cleanup
@@ -6,7 +6,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary cleanup
                 [(-d | --dry)]
@@ -21,9 +21,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/compressiondictionary$export b/test/resources/nodetool/help/compressiondictionary$export
index fc2f24ef7c..5badf5794f 100644
--- a/test/resources/nodetool/help/compressiondictionary$export
+++ b/test/resources/nodetool/help/compressiondictionary$export
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary export
                 [(-i <dictId> | --id <dictId>)] [--] <keyspace> <table> <dictionaryPath>
@@ -20,9 +20,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/compressiondictionary$import b/test/resources/nodetool/help/compressiondictionary$import
index 1bc2998986..37ab9f9aa9 100644
--- a/test/resources/nodetool/help/compressiondictionary$import
+++ b/test/resources/nodetool/help/compressiondictionary$import
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary import
                 [--] <dictionaryPath>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/compressiondictionary$list b/test/resources/nodetool/help/compressiondictionary$list
index e9b37215e0..11d0c64b5d 100644
--- a/test/resources/nodetool/help/compressiondictionary$list
+++ b/test/resources/nodetool/help/compressiondictionary$list
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary list
                 [--] <keyspace> <table>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/compressiondictionary$train b/test/resources/nodetool/help/compressiondictionary$train
index 206a6d2b0b..3599f0dd20 100644
--- a/test/resources/nodetool/help/compressiondictionary$train
+++ b/test/resources/nodetool/help/compressiondictionary$train
@@ -5,7 +5,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary train
                 [(-f | --force)] [--max-dict-size <trainingMaxDictionarySize>]
@@ -36,9 +36,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/consensus_admin b/test/resources/nodetool/help/consensus_admin
index 749675119a..f031de4c48 100644
--- a/test/resources/nodetool/help/consensus_admin
+++ b/test/resources/nodetool/help/consensus_admin
@@ -4,13 +4,13 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] consensus_admin <command>
                 [<args>]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)]
                 consensus_admin begin-migration
@@ -19,7 +19,7 @@ SYNOPSIS
                 <tables>
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)]
                 consensus_admin finish-migration
@@ -28,7 +28,7 @@ SYNOPSIS
                 <tables>
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] consensus_admin list
                 [(-f <format> | --format <format>)] [--] <keyspace> <tables>
@@ -40,9 +40,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/consensus_admin$begin-migration b/test/resources/nodetool/help/consensus_admin$begin-migration
index 11d7529cc0..d9a59c976a 100644
--- a/test/resources/nodetool/help/consensus_admin$begin-migration
+++ b/test/resources/nodetool/help/consensus_admin$begin-migration
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)]
                 consensus_admin begin-migration
@@ -22,9 +22,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/consensus_admin$finish-migration b/test/resources/nodetool/help/consensus_admin$finish-migration
index ef0b9fbec8..ed557c2e99 100644
--- a/test/resources/nodetool/help/consensus_admin$finish-migration
+++ b/test/resources/nodetool/help/consensus_admin$finish-migration
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)]
                 consensus_admin finish-migration
@@ -22,9 +22,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/consensus_admin$list b/test/resources/nodetool/help/consensus_admin$list
index aef67a2ac5..dd9649e325 100644
--- a/test/resources/nodetool/help/consensus_admin$list
+++ b/test/resources/nodetool/help/consensus_admin$list
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] consensus_admin list
                 [(-f <format> | --format <format>)] [--] <keyspace> <tables>
@@ -19,9 +19,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/datapaths b/test/resources/nodetool/help/datapaths
index 5917977861..5cfa193fbb 100644
--- a/test/resources/nodetool/help/datapaths
+++ b/test/resources/nodetool/help/datapaths
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] datapaths
                 [(-F <format> | --format <format>)] [--] [<keyspace.table>...]
@@ -19,9 +19,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/decommission b/test/resources/nodetool/help/decommission
index d4933b11e9..29a17ca667 100644
--- a/test/resources/nodetool/help/decommission
+++ b/test/resources/nodetool/help/decommission
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] decommission [(-f | --force)]
 
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/describecluster b/test/resources/nodetool/help/describecluster
index 37cb1269b3..0c1736e851 100644
--- a/test/resources/nodetool/help/describecluster
+++ b/test/resources/nodetool/help/describecluster
@@ -4,9 +4,10 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] describecluster
+                [(-pp | --print-port)]
 
 OPTIONS
         -h <host>, --host <host>
diff --git a/test/resources/nodetool/help/describering b/test/resources/nodetool/help/describering
index afc505f10b..6714b10e5f 100644
--- a/test/resources/nodetool/help/describering
+++ b/test/resources/nodetool/help/describering
@@ -3,9 +3,10 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
-                [(-u <username> | --username <username>)] describering [--] <keyspace>
+                [(-u <username> | --username <username>)] describering
+                [(-pp | --print-port)] [--] <keyspace>
 
 OPTIONS
         -h <host>, --host <host>
diff --git a/test/resources/nodetool/help/disableauditlog b/test/resources/nodetool/help/disableauditlog
index e1c1410ac6..313507b927 100644
--- a/test/resources/nodetool/help/disableauditlog
+++ b/test/resources/nodetool/help/disableauditlog
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] disableauditlog
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/disableautocompaction b/test/resources/nodetool/help/disableautocompaction
index 0d6f7ea426..0dcb669efc 100644
--- a/test/resources/nodetool/help/disableautocompaction
+++ b/test/resources/nodetool/help/disableautocompaction
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] disableautocompaction [--]
                 [<keyspace> <tables>...]
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/disablebackup b/test/resources/nodetool/help/disablebackup
index 8fbd12176a..bd42e83147 100644
--- a/test/resources/nodetool/help/disablebackup
+++ b/test/resources/nodetool/help/disablebackup
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] disablebackup
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/disablebinary b/test/resources/nodetool/help/disablebinary
index bb4997e6f8..90fa15800a 100644
--- a/test/resources/nodetool/help/disablebinary
+++ b/test/resources/nodetool/help/disablebinary
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] disablebinary
                 [(-f | --force)]
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/disablefullquerylog b/test/resources/nodetool/help/disablefullquerylog
index 6d46dff1d8..244037dde5 100644
--- a/test/resources/nodetool/help/disablefullquerylog
+++ b/test/resources/nodetool/help/disablefullquerylog
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] disablefullquerylog
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/disablegossip b/test/resources/nodetool/help/disablegossip
index dc39174516..7948124377 100644
--- a/test/resources/nodetool/help/disablegossip
+++ b/test/resources/nodetool/help/disablegossip
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] disablegossip
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/disablehandoff b/test/resources/nodetool/help/disablehandoff
index c51b5fa2c8..fea8815f6a 100644
--- a/test/resources/nodetool/help/disablehandoff
+++ b/test/resources/nodetool/help/disablehandoff
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] disablehandoff
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/disablehintsfordc b/test/resources/nodetool/help/disablehintsfordc
index be2561631d..1c2fb7e063 100644
--- a/test/resources/nodetool/help/disablehintsfordc
+++ b/test/resources/nodetool/help/disablehintsfordc
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] disablehintsfordc [--]
                 <datacenter>
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/disableoldprotocolversions b/test/resources/nodetool/help/disableoldprotocolversions
index 2e37bf2d0e..baf4cce38d 100644
--- a/test/resources/nodetool/help/disableoldprotocolversions
+++ b/test/resources/nodetool/help/disableoldprotocolversions
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] disableoldprotocolversions
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/drain b/test/resources/nodetool/help/drain
index 6c062e74c4..18ce387521 100644
--- a/test/resources/nodetool/help/drain
+++ b/test/resources/nodetool/help/drain
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] drain
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/dropcidrgroup b/test/resources/nodetool/help/dropcidrgroup
index abc83659dc..ad3c87412c 100644
--- a/test/resources/nodetool/help/dropcidrgroup
+++ b/test/resources/nodetool/help/dropcidrgroup
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] dropcidrgroup [--] <cidrGroup>
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/enableauditlog b/test/resources/nodetool/help/enableauditlog
index 005499eaf2..581a8d942d 100644
--- a/test/resources/nodetool/help/enableauditlog
+++ b/test/resources/nodetool/help/enableauditlog
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] enableauditlog
                 [--archive-command <archive_command>] [--blocking <blocking>]
@@ -73,9 +73,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/enableautocompaction b/test/resources/nodetool/help/enableautocompaction
index 647c10f57a..5d3a18a502 100644
--- a/test/resources/nodetool/help/enableautocompaction
+++ b/test/resources/nodetool/help/enableautocompaction
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] enableautocompaction [--]
                 [<keyspace> <tables>...]
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/enablebackup b/test/resources/nodetool/help/enablebackup
index 1a36e2710c..e7330f7f5b 100644
--- a/test/resources/nodetool/help/enablebackup
+++ b/test/resources/nodetool/help/enablebackup
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] enablebackup
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/enablebinary b/test/resources/nodetool/help/enablebinary
index 1485e5783d..67f9ae0080 100644
--- a/test/resources/nodetool/help/enablebinary
+++ b/test/resources/nodetool/help/enablebinary
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] enablebinary
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/enablefullquerylog b/test/resources/nodetool/help/enablefullquerylog
index 5335600e13..47dc23bdcd 100644
--- a/test/resources/nodetool/help/enablefullquerylog
+++ b/test/resources/nodetool/help/enablefullquerylog
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] enablefullquerylog
                 [--archive-command <archive_command>] [--blocking <blocking>]
@@ -45,9 +45,6 @@ OPTIONS
             Path to store the full query log at. Will have it's contents
             recursively deleted.
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/enablegossip b/test/resources/nodetool/help/enablegossip
index b2d1deef0a..3d10f993ce 100644
--- a/test/resources/nodetool/help/enablegossip
+++ b/test/resources/nodetool/help/enablegossip
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] enablegossip
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/enablehandoff b/test/resources/nodetool/help/enablehandoff
index 78f78aa2fc..c4ddea0e5d 100644
--- a/test/resources/nodetool/help/enablehandoff
+++ b/test/resources/nodetool/help/enablehandoff
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] enablehandoff
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/enablehintsfordc b/test/resources/nodetool/help/enablehintsfordc
index 2728882a59..b7a6f38d64 100644
--- a/test/resources/nodetool/help/enablehintsfordc
+++ b/test/resources/nodetool/help/enablehintsfordc
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] enablehintsfordc [--]
                 <datacenter>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/enableoldprotocolversions b/test/resources/nodetool/help/enableoldprotocolversions
index bbb43ae147..dac16eef80 100644
--- a/test/resources/nodetool/help/enableoldprotocolversions
+++ b/test/resources/nodetool/help/enableoldprotocolversions
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] enableoldprotocolversions
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/failuredetector b/test/resources/nodetool/help/failuredetector
index cc5a2286b6..846e850897 100644
--- a/test/resources/nodetool/help/failuredetector
+++ b/test/resources/nodetool/help/failuredetector
@@ -4,9 +4,10 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] failuredetector
+                [(-pp | --print-port)]
 
 OPTIONS
         -h <host>, --host <host>
diff --git a/test/resources/nodetool/help/flush b/test/resources/nodetool/help/flush
index 3d467a907e..0c6a1280eb 100644
--- a/test/resources/nodetool/help/flush
+++ b/test/resources/nodetool/help/flush
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] flush [--] [<keyspace>
                 <tables>...]
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/forcecompact b/test/resources/nodetool/help/forcecompact
index 9f0de059c4..313026a64f 100644
--- a/test/resources/nodetool/help/forcecompact
+++ b/test/resources/nodetool/help/forcecompact
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] forcecompact [--] [<keyspace>
                 <table> <keys>]
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/garbagecollect b/test/resources/nodetool/help/garbagecollect
index 1eec8a03ce..3004ff777a 100644
--- a/test/resources/nodetool/help/garbagecollect
+++ b/test/resources/nodetool/help/garbagecollect
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] garbagecollect
                 [(-g <granularity> | --granularity <granularity>)]
@@ -25,9 +25,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/gcstats b/test/resources/nodetool/help/gcstats
index a0040c4bf1..d71afe6a12 100644
--- a/test/resources/nodetool/help/gcstats
+++ b/test/resources/nodetool/help/gcstats
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] gcstats
                 [(-F <format> | --format <format>)] [(-H | --human-readable)]
@@ -21,9 +21,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getauditlog b/test/resources/nodetool/help/getauditlog
index d69ce5bec6..e1ff2f0b60 100644
--- a/test/resources/nodetool/help/getauditlog
+++ b/test/resources/nodetool/help/getauditlog
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getauditlog
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getauthcacheconfig b/test/resources/nodetool/help/getauthcacheconfig
index c2a9e5a43e..8c8f43d9ec 100644
--- a/test/resources/nodetool/help/getauthcacheconfig
+++ b/test/resources/nodetool/help/getauthcacheconfig
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getauthcacheconfig
                 [--cache-name <cache-name>]
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getautorepairconfig b/test/resources/nodetool/help/getautorepairconfig
index b853ea4ab7..955d21202d 100644
--- a/test/resources/nodetool/help/getautorepairconfig
+++ b/test/resources/nodetool/help/getautorepairconfig
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getautorepairconfig
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getbatchlogreplaythrottle b/test/resources/nodetool/help/getbatchlogreplaythrottle
index 27543bb5ba..4f70e82502 100644
--- a/test/resources/nodetool/help/getbatchlogreplaythrottle
+++ b/test/resources/nodetool/help/getbatchlogreplaythrottle
@@ -5,7 +5,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getbatchlogreplaythrottle
 
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getcidrgroupsofip b/test/resources/nodetool/help/getcidrgroupsofip
index 49d6a4142b..32669af9d8 100644
--- a/test/resources/nodetool/help/getcidrgroupsofip
+++ b/test/resources/nodetool/help/getcidrgroupsofip
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getcidrgroupsofip [--]
                 <ip_address>
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getcolumnindexsize b/test/resources/nodetool/help/getcolumnindexsize
index 637b6318b2..f846f98474 100644
--- a/test/resources/nodetool/help/getcolumnindexsize
+++ b/test/resources/nodetool/help/getcolumnindexsize
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getcolumnindexsize
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getcompactionthreshold b/test/resources/nodetool/help/getcompactionthreshold
index 913eee8ae0..ac991b5e48 100644
--- a/test/resources/nodetool/help/getcompactionthreshold
+++ b/test/resources/nodetool/help/getcompactionthreshold
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getcompactionthreshold [--]
                 <keyspace> <table>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getcompactionthroughput b/test/resources/nodetool/help/getcompactionthroughput
index 6e46a6a89a..32bb4160c0 100644
--- a/test/resources/nodetool/help/getcompactionthroughput
+++ b/test/resources/nodetool/help/getcompactionthroughput
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getcompactionthroughput
                 [(-d | --precise-mib)]
@@ -20,9 +20,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getconcurrency b/test/resources/nodetool/help/getconcurrency
index 69a1389c5e..ef18c22188 100644
--- a/test/resources/nodetool/help/getconcurrency
+++ b/test/resources/nodetool/help/getconcurrency
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getconcurrency [--]
                 <stage-names>
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getconcurrentcompactors b/test/resources/nodetool/help/getconcurrentcompactors
index 887d845ec1..5c5e94198e 100644
--- a/test/resources/nodetool/help/getconcurrentcompactors
+++ b/test/resources/nodetool/help/getconcurrentcompactors
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getconcurrentcompactors
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getconcurrentviewbuilders b/test/resources/nodetool/help/getconcurrentviewbuilders
index 852f59465e..be4d1378ff 100644
--- a/test/resources/nodetool/help/getconcurrentviewbuilders
+++ b/test/resources/nodetool/help/getconcurrentviewbuilders
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getconcurrentviewbuilders
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getdefaultrf b/test/resources/nodetool/help/getdefaultrf
index 97c6df2539..8572bf9f5f 100644
--- a/test/resources/nodetool/help/getdefaultrf
+++ b/test/resources/nodetool/help/getdefaultrf
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getdefaultrf
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getendpoints b/test/resources/nodetool/help/getendpoints
index eada8ad571..7eb9aef60d 100644
--- a/test/resources/nodetool/help/getendpoints
+++ b/test/resources/nodetool/help/getendpoints
@@ -3,10 +3,10 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
-                [(-u <username> | --username <username>)] getendpoints [--] <keyspace>
-                <table> <key>
+                [(-u <username> | --username <username>)] getendpoints
+                [(-pp | --print-port)] [--] <keyspace> <table> <key>
 
 OPTIONS
         -h <host>, --host <host>
diff --git a/test/resources/nodetool/help/getfullquerylog b/test/resources/nodetool/help/getfullquerylog
index 74a75b2396..8045a82e08 100644
--- a/test/resources/nodetool/help/getfullquerylog
+++ b/test/resources/nodetool/help/getfullquerylog
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getfullquerylog
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getguardrailsconfig b/test/resources/nodetool/help/getguardrailsconfig
index 8b1841b6fa..687c51f67b 100644
--- a/test/resources/nodetool/help/getguardrailsconfig
+++ b/test/resources/nodetool/help/getguardrailsconfig
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getguardrailsconfig
                 [(-c <guardrailCategory> | --category <guardrailCategory>)] [--expand]
@@ -25,9 +25,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getinterdcstreamthroughput b/test/resources/nodetool/help/getinterdcstreamthroughput
index dcfe3b106a..bc825490c4 100644
--- a/test/resources/nodetool/help/getinterdcstreamthroughput
+++ b/test/resources/nodetool/help/getinterdcstreamthroughput
@@ -6,7 +6,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getinterdcstreamthroughput
                 [(-d | --precise-mbit)] [(-e | --entire-sstable-throughput)]
@@ -29,9 +29,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getlogginglevels b/test/resources/nodetool/help/getlogginglevels
index 2cbf788f06..cbfd86eb77 100644
--- a/test/resources/nodetool/help/getlogginglevels
+++ b/test/resources/nodetool/help/getlogginglevels
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getlogginglevels
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getmaxhintwindow b/test/resources/nodetool/help/getmaxhintwindow
index c3e36094c9..a6c1b930e8 100644
--- a/test/resources/nodetool/help/getmaxhintwindow
+++ b/test/resources/nodetool/help/getmaxhintwindow
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getmaxhintwindow
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getseeds b/test/resources/nodetool/help/getseeds
index dbe6dcc828..5f7705892b 100644
--- a/test/resources/nodetool/help/getseeds
+++ b/test/resources/nodetool/help/getseeds
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getseeds
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getsnapshotthrottle b/test/resources/nodetool/help/getsnapshotthrottle
index 91611e9b1e..de17e1e81f 100644
--- a/test/resources/nodetool/help/getsnapshotthrottle
+++ b/test/resources/nodetool/help/getsnapshotthrottle
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getsnapshotthrottle
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getsstables b/test/resources/nodetool/help/getsstables
index d5cf795af9..8d26cd8026 100644
--- a/test/resources/nodetool/help/getsstables
+++ b/test/resources/nodetool/help/getsstables
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getsstables
                 [(-hf | --hex-format)] [(-l | --show-levels)] [--] <keyspace> <cfname>
@@ -23,9 +23,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/getstreamthroughput b/test/resources/nodetool/help/getstreamthroughput
index c44e58ab9e..1eff045f1b 100644
--- a/test/resources/nodetool/help/getstreamthroughput
+++ b/test/resources/nodetool/help/getstreamthroughput
@@ -5,7 +5,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getstreamthroughput
                 [(-d | --precise-mbit)] [(-e | --entire-sstable-throughput)]
@@ -27,9 +27,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/gettimeout b/test/resources/nodetool/help/gettimeout
index 303bb66cd5..58e1c38068 100644
--- a/test/resources/nodetool/help/gettimeout
+++ b/test/resources/nodetool/help/gettimeout
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] gettimeout [--] <timeout_type>
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/gettraceprobability b/test/resources/nodetool/help/gettraceprobability
index 56b8b91212..8252df2f56 100644
--- a/test/resources/nodetool/help/gettraceprobability
+++ b/test/resources/nodetool/help/gettraceprobability
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] gettraceprobability
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/gossipinfo b/test/resources/nodetool/help/gossipinfo
index adb3e9ccda..ec85903e21 100644
--- a/test/resources/nodetool/help/gossipinfo
+++ b/test/resources/nodetool/help/gossipinfo
@@ -3,10 +3,10 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] gossipinfo
-                [(-r | --resolve-ip)]
+                [(-pp | --print-port)] [(-r | --resolve-ip)]
 
 OPTIONS
         -h <host>, --host <host>
diff --git a/test/resources/nodetool/help/history b/test/resources/nodetool/help/history
index 80bfe85a70..76eee5d057 100644
--- a/test/resources/nodetool/help/history
+++ b/test/resources/nodetool/help/history
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] history
                 [(-n <commands> | --number-of-commands <commands>)]
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
@@ -28,4 +25,4 @@ OPTIONS
             Path to the JMX password file
 
         -u <username>, --username <username>
-            Remote jmx agent username
\ No newline at end of file
+            Remote jmx agent username
diff --git a/test/resources/nodetool/help/import b/test/resources/nodetool/help/import
index 672d839a5c..5c3a3b2202 100644
--- a/test/resources/nodetool/help/import
+++ b/test/resources/nodetool/help/import
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] import
                 [(-c | --no-invalidate-caches)] [(-cd | --copy-data)]
@@ -35,9 +35,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/info b/test/resources/nodetool/help/info
index 4d4699dedb..f86df194b6 100644
--- a/test/resources/nodetool/help/info
+++ b/test/resources/nodetool/help/info
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] info [(-T | --tokens)]
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/invalidatecidrpermissionscache b/test/resources/nodetool/help/invalidatecidrpermissionscache
index ba53df15d8..c4c5b7d80d 100644
--- a/test/resources/nodetool/help/invalidatecidrpermissionscache
+++ b/test/resources/nodetool/help/invalidatecidrpermissionscache
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)]
                 invalidatecidrpermissionscache [--] [<role>...]
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/invalidatecountercache b/test/resources/nodetool/help/invalidatecountercache
index 9229ca6c7d..c7b27dd4f2 100644
--- a/test/resources/nodetool/help/invalidatecountercache
+++ b/test/resources/nodetool/help/invalidatecountercache
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] invalidatecountercache
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/invalidatecredentialscache b/test/resources/nodetool/help/invalidatecredentialscache
index ed7ba1f2dc..fcd6ef44be 100644
--- a/test/resources/nodetool/help/invalidatecredentialscache
+++ b/test/resources/nodetool/help/invalidatecredentialscache
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] invalidatecredentialscache
                 [--] [<role>...]
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/invalidatejmxpermissionscache b/test/resources/nodetool/help/invalidatejmxpermissionscache
index 22b1a70819..b66fac8baf 100644
--- a/test/resources/nodetool/help/invalidatejmxpermissionscache
+++ b/test/resources/nodetool/help/invalidatejmxpermissionscache
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] invalidatejmxpermissionscache
                 [--] [<role>...]
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/invalidatekeycache b/test/resources/nodetool/help/invalidatekeycache
index 6ec5300e08..92e3d00c5d 100644
--- a/test/resources/nodetool/help/invalidatekeycache
+++ b/test/resources/nodetool/help/invalidatekeycache
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] invalidatekeycache
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/invalidatenetworkpermissionscache b/test/resources/nodetool/help/invalidatenetworkpermissionscache
index 9c77fb0fda..6001b0bd16 100644
--- a/test/resources/nodetool/help/invalidatenetworkpermissionscache
+++ b/test/resources/nodetool/help/invalidatenetworkpermissionscache
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)]
                 invalidatenetworkpermissionscache [--] [<role>...]
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/invalidatepermissionscache b/test/resources/nodetool/help/invalidatepermissionscache
index ed9a3e7211..67566462d1 100644
--- a/test/resources/nodetool/help/invalidatepermissionscache
+++ b/test/resources/nodetool/help/invalidatepermissionscache
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] invalidatepermissionscache
                 [--all-functions] [--all-keyspaces] [--all-mbeans] [--all-roles]
@@ -48,9 +48,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/invalidaterolescache b/test/resources/nodetool/help/invalidaterolescache
index fa02644439..18d90c671c 100644
--- a/test/resources/nodetool/help/invalidaterolescache
+++ b/test/resources/nodetool/help/invalidaterolescache
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] invalidaterolescache [--]
                 [<role>...]
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/invalidaterowcache b/test/resources/nodetool/help/invalidaterowcache
index fbe3db99ae..1342ac62f4 100644
--- a/test/resources/nodetool/help/invalidaterowcache
+++ b/test/resources/nodetool/help/invalidaterowcache
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] invalidaterowcache
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/join b/test/resources/nodetool/help/join
index e2fc38c0a4..fb6a49b408 100644
--- a/test/resources/nodetool/help/join
+++ b/test/resources/nodetool/help/join
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] join
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/listcidrgroups b/test/resources/nodetool/help/listcidrgroups
index 99292b8e5b..153dee1414 100644
--- a/test/resources/nodetool/help/listcidrgroups
+++ b/test/resources/nodetool/help/listcidrgroups
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] listcidrgroups [--]
                 <cidrGroup>
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/listpendinghints b/test/resources/nodetool/help/listpendinghints
index 638511085e..8e14e4a2a5 100644
--- a/test/resources/nodetool/help/listpendinghints
+++ b/test/resources/nodetool/help/listpendinghints
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] listpendinghints
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/listsnapshots b/test/resources/nodetool/help/listsnapshots
index 7dbcd04121..a97aed77dd 100644
--- a/test/resources/nodetool/help/listsnapshots
+++ b/test/resources/nodetool/help/listsnapshots
@@ -7,7 +7,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] listsnapshots
                 [(-e | --ephemeral)] [(-k <keyspace> | --keyspace <keyspace>)]
@@ -33,9 +33,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/move b/test/resources/nodetool/help/move
index 85df33ca93..1486303374 100644
--- a/test/resources/nodetool/help/move
+++ b/test/resources/nodetool/help/move
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] move [--resume] [--]
                 <newToken>
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/netstats b/test/resources/nodetool/help/netstats
index 07354daf6b..8ee403cbc7 100644
--- a/test/resources/nodetool/help/netstats
+++ b/test/resources/nodetool/help/netstats
@@ -4,10 +4,10 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] netstats
-                [(-H | --human-readable)]
+                [(-H | --human-readable)] [(-pp | --print-port)]
 
 OPTIONS
         -h <host>, --host <host>
diff --git a/test/resources/nodetool/help/nodetool b/test/resources/nodetool/help/nodetool
index 7597462fa0..a3fe2c520e 100644
--- a/test/resources/nodetool/help/nodetool
+++ b/test/resources/nodetool/help/nodetool
@@ -1,5 +1,5 @@
 usage: nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] <command> [<args>]
 
diff --git a/test/resources/nodetool/help/pausehandoff b/test/resources/nodetool/help/pausehandoff
index 892f5c9e9b..07e9d21366 100644
--- a/test/resources/nodetool/help/pausehandoff
+++ b/test/resources/nodetool/help/pausehandoff
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] pausehandoff
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/profile b/test/resources/nodetool/help/profile
index 3724d5f3e7..5827200b19 100644
--- a/test/resources/nodetool/help/profile
+++ b/test/resources/nodetool/help/profile
@@ -3,12 +3,12 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] profile <command> [<args>]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] profile start
                 [(-d <duration> | --duration <duration>)]
@@ -17,34 +17,34 @@ SYNOPSIS
                 [(-o <filename> | --output <filename>)]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] profile stop
                 [(-o <filename> | --output <filename>)]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] profile execute [--] <command>
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] profile purge
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] profile list
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] profile fetch [--]
                 <remoteFile> <localFile>
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] profile status
 
@@ -55,9 +55,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/profile$execute b/test/resources/nodetool/help/profile$execute
index b95e75fcb3..ce105a3741 100644
--- a/test/resources/nodetool/help/profile$execute
+++ b/test/resources/nodetool/help/profile$execute
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] profile execute [--] <command>
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/profile$fetch b/test/resources/nodetool/help/profile$fetch
index 351bac9332..cc06d66b62 100644
--- a/test/resources/nodetool/help/profile$fetch
+++ b/test/resources/nodetool/help/profile$fetch
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] profile fetch [--]
                 <remoteFile> <localFile>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/profile$list b/test/resources/nodetool/help/profile$list
index 46c08f6967..4f2f91ac76 100644
--- a/test/resources/nodetool/help/profile$list
+++ b/test/resources/nodetool/help/profile$list
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] profile list
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/profile$purge b/test/resources/nodetool/help/profile$purge
index 5afb33fade..3fb0b536c9 100644
--- a/test/resources/nodetool/help/profile$purge
+++ b/test/resources/nodetool/help/profile$purge
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] profile purge
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/profile$start b/test/resources/nodetool/help/profile$start
index 85a4238e56..936df1258f 100644
--- a/test/resources/nodetool/help/profile$start
+++ b/test/resources/nodetool/help/profile$start
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] profile start
                 [(-d <duration> | --duration <duration>)]
@@ -35,9 +35,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/profile$status b/test/resources/nodetool/help/profile$status
index 029e47a118..17cba2779f 100644
--- a/test/resources/nodetool/help/profile$status
+++ b/test/resources/nodetool/help/profile$status
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] profile status
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/profile$stop b/test/resources/nodetool/help/profile$stop
index 547490c1df..6c159a003a 100644
--- a/test/resources/nodetool/help/profile$stop
+++ b/test/resources/nodetool/help/profile$stop
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] profile stop
                 [(-o <filename> | --output <filename>)]
@@ -19,9 +19,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/profileload b/test/resources/nodetool/help/profileload
index 636592490c..97102737eb 100644
--- a/test/resources/nodetool/help/profileload
+++ b/test/resources/nodetool/help/profileload
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] profileload [-a <samplers>]
                 [(-i <intervalMillis> | --interval <intervalMillis>)] [-k <topCount>]
@@ -31,9 +31,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/proxyhistograms b/test/resources/nodetool/help/proxyhistograms
index 5aa2079069..86a2f6c581 100644
--- a/test/resources/nodetool/help/proxyhistograms
+++ b/test/resources/nodetool/help/proxyhistograms
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] proxyhistograms
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/rangekeysample b/test/resources/nodetool/help/rangekeysample
index dd2d7a26c4..9b33004f4b 100644
--- a/test/resources/nodetool/help/rangekeysample
+++ b/test/resources/nodetool/help/rangekeysample
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] rangekeysample
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/rebuild b/test/resources/nodetool/help/rebuild
index bdfdae5bfd..8a67f6477b 100644
--- a/test/resources/nodetool/help/rebuild
+++ b/test/resources/nodetool/help/rebuild
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] rebuild [--exclude-local-dc]
                 [(-ks <specific_keyspace> | --keyspace <specific_keyspace>)]
@@ -26,9 +26,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/rebuild_index b/test/resources/nodetool/help/rebuild_index
index 020973fdce..55b71ea06c 100644
--- a/test/resources/nodetool/help/rebuild_index
+++ b/test/resources/nodetool/help/rebuild_index
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] rebuild_index [--] <keyspace>
                 <table> <indexName...>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/recompress_sstables b/test/resources/nodetool/help/recompress_sstables
index 1835f7ea72..87b2ba2673 100644
--- a/test/resources/nodetool/help/recompress_sstables
+++ b/test/resources/nodetool/help/recompress_sstables
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] recompress_sstables
                 [(-j <jobs> | --jobs <jobs>)] [--] [<keyspace> <tables>...]
@@ -20,9 +20,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/refresh b/test/resources/nodetool/help/refresh
index 0e4117dd83..8c0e589b32 100644
--- a/test/resources/nodetool/help/refresh
+++ b/test/resources/nodetool/help/refresh
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] refresh [--] <keyspace>
                 <table>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/refreshsizeestimates b/test/resources/nodetool/help/refreshsizeestimates
index 48f1690e9e..2e8350751b 100644
--- a/test/resources/nodetool/help/refreshsizeestimates
+++ b/test/resources/nodetool/help/refreshsizeestimates
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] refreshsizeestimates
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/reloadcidrgroupscache b/test/resources/nodetool/help/reloadcidrgroupscache
index 3012157b08..6cd7c7db74 100644
--- a/test/resources/nodetool/help/reloadcidrgroupscache
+++ b/test/resources/nodetool/help/reloadcidrgroupscache
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] reloadcidrgroupscache
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/reloadlocalschema b/test/resources/nodetool/help/reloadlocalschema
index df937eaa9c..3a0abe3c25 100644
--- a/test/resources/nodetool/help/reloadlocalschema
+++ b/test/resources/nodetool/help/reloadlocalschema
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] reloadlocalschema
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/reloadseeds b/test/resources/nodetool/help/reloadseeds
index 2cdd324fdf..fe3858ecc4 100644
--- a/test/resources/nodetool/help/reloadseeds
+++ b/test/resources/nodetool/help/reloadseeds
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] reloadseeds
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/reloadssl b/test/resources/nodetool/help/reloadssl
index e620723d9b..b2ff8ac59e 100644
--- a/test/resources/nodetool/help/reloadssl
+++ b/test/resources/nodetool/help/reloadssl
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] reloadssl
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/reloadtriggers b/test/resources/nodetool/help/reloadtriggers
index 0160fd39e1..2078df5e32 100644
--- a/test/resources/nodetool/help/reloadtriggers
+++ b/test/resources/nodetool/help/reloadtriggers
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] reloadtriggers
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/relocatesstables b/test/resources/nodetool/help/relocatesstables
index a57d661029..9e64ca9faf 100644
--- a/test/resources/nodetool/help/relocatesstables
+++ b/test/resources/nodetool/help/relocatesstables
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] relocatesstables
                 [(-j <jobs> | --jobs <jobs>)] [--] <keyspace> <table>
@@ -19,9 +19,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/removenode b/test/resources/nodetool/help/removenode
index a08d765e7d..db97051b32 100644
--- a/test/resources/nodetool/help/removenode
+++ b/test/resources/nodetool/help/removenode
@@ -4,15 +4,16 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] removenode [--force] [--]
                 <nodeId><command> [<args>]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] removenode status
+                [(-pp | --print-port)]
 
 OPTIONS
         --force
@@ -24,9 +25,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
@@ -49,3 +47,6 @@ COMMANDS
 
         status
             Show status of the current node removal operation
+
+            With --print-port option, Operate in 4.0 mode with hosts disambiguated by
+            port number
diff --git a/test/resources/nodetool/help/removenode$status b/test/resources/nodetool/help/removenode$status
index 70e79d3f56..730fa0239d 100644
--- a/test/resources/nodetool/help/removenode$status
+++ b/test/resources/nodetool/help/removenode$status
@@ -4,9 +4,10 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] removenode status
+                [(-pp | --print-port)]
 
 OPTIONS
         -h <host>, --host <host>
diff --git a/test/resources/nodetool/help/repair b/test/resources/nodetool/help/repair
index 3890077a42..2f20f5c686 100644
--- a/test/resources/nodetool/help/repair
+++ b/test/resources/nodetool/help/repair
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] repair
                 [(-accord-only | --accord-only)]
@@ -86,9 +86,6 @@ OPTIONS
             Use --pull to perform a one way repair where data is only streamed
             from a remote node to this node.
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pr, --partitioner-range
             Use -pr to repair only the first range returned by the partitioner
 
diff --git a/test/resources/nodetool/help/repair_admin b/test/resources/nodetool/help/repair_admin
index ffa401f015..62d3eafada 100644
--- a/test/resources/nodetool/help/repair_admin
+++ b/test/resources/nodetool/help/repair_admin
@@ -3,20 +3,20 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] repair_admin <command>
                 [<args>]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] repair_admin list
                 [(-a | --all)] [(-et <end_token> | --end-token <end_token>)]
                 [(-st <start_token> | --start-token <start_token>)]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)]
                 repair_admin summarize-pending
@@ -25,7 +25,7 @@ SYNOPSIS
                 [--] [<keyspace> <tables>...]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)]
                 repair_admin summarize-repaired
@@ -34,7 +34,7 @@ SYNOPSIS
                 [--] [<keyspace> <tables>...]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] repair_admin cleanup
                 [(-et <end_token> | --end-token <end_token>)] [(-f | --force)]
@@ -42,7 +42,7 @@ SYNOPSIS
                 <tables>...]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] repair_admin cancel
                 [(-f | --force)] [(-s <session> | --session <session>)]
@@ -54,9 +54,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/repair_admin$cancel b/test/resources/nodetool/help/repair_admin$cancel
index a0c705f563..dc6e8437ef 100644
--- a/test/resources/nodetool/help/repair_admin$cancel
+++ b/test/resources/nodetool/help/repair_admin$cancel
@@ -5,7 +5,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] repair_admin cancel
                 [(-f | --force)] [(-s <session> | --session <session>)]
@@ -20,9 +20,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/repair_admin$cleanup b/test/resources/nodetool/help/repair_admin$cleanup
index 0dbd8d5fe1..cb065e1b41 100644
--- a/test/resources/nodetool/help/repair_admin$cleanup
+++ b/test/resources/nodetool/help/repair_admin$cleanup
@@ -6,7 +6,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] repair_admin cleanup
                 [(-et <end_token> | --end-token <end_token>)] [(-f | --force)]
@@ -26,9 +26,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/repair_admin$list b/test/resources/nodetool/help/repair_admin$list
index 7912d5658d..70a9859901 100644
--- a/test/resources/nodetool/help/repair_admin$list
+++ b/test/resources/nodetool/help/repair_admin$list
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] repair_admin list
                 [(-a | --all)] [(-et <end_token> | --end-token <end_token>)]
@@ -22,9 +22,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/repair_admin$summarize-pending b/test/resources/nodetool/help/repair_admin$summarize-pending
index 763f67361c..18fbc11e0d 100644
--- a/test/resources/nodetool/help/repair_admin$summarize-pending
+++ b/test/resources/nodetool/help/repair_admin$summarize-pending
@@ -5,7 +5,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)]
                 repair_admin summarize-pending
@@ -23,9 +23,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/repair_admin$summarize-repaired b/test/resources/nodetool/help/repair_admin$summarize-repaired
index 8490781848..4451460b9b 100644
--- a/test/resources/nodetool/help/repair_admin$summarize-repaired
+++ b/test/resources/nodetool/help/repair_admin$summarize-repaired
@@ -5,7 +5,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)]
                 repair_admin summarize-repaired
@@ -23,9 +23,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/replaybatchlog b/test/resources/nodetool/help/replaybatchlog
index 2a681b6dd6..7201060667 100644
--- a/test/resources/nodetool/help/replaybatchlog
+++ b/test/resources/nodetool/help/replaybatchlog
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] replaybatchlog
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/resetfullquerylog b/test/resources/nodetool/help/resetfullquerylog
index 74cd5ae0e6..4096427b18 100644
--- a/test/resources/nodetool/help/resetfullquerylog
+++ b/test/resources/nodetool/help/resetfullquerylog
@@ -5,7 +5,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] resetfullquerylog
 
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/resetlocalschema b/test/resources/nodetool/help/resetlocalschema
index 36208b4f07..faab9d56f2 100644
--- a/test/resources/nodetool/help/resetlocalschema
+++ b/test/resources/nodetool/help/resetlocalschema
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] resetlocalschema
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/resumehandoff b/test/resources/nodetool/help/resumehandoff
index 46a833467d..a306e7b7d1 100644
--- a/test/resources/nodetool/help/resumehandoff
+++ b/test/resources/nodetool/help/resumehandoff
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] resumehandoff
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/ring b/test/resources/nodetool/help/ring
index ea5a31c5fb..de45617b5a 100644
--- a/test/resources/nodetool/help/ring
+++ b/test/resources/nodetool/help/ring
@@ -3,10 +3,10 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
-                [(-u <username> | --username <username>)] ring [(-r | --resolve-ip)]
-                [--] <keyspace>
+                [(-u <username> | --username <username>)] ring [(-pp | --print-port)]
+                [(-r | --resolve-ip)] [--] <keyspace>
 
 OPTIONS
         -h <host>, --host <host>
diff --git a/test/resources/nodetool/help/scrub b/test/resources/nodetool/help/scrub
index 289ec3206f..4e60ccd580 100644
--- a/test/resources/nodetool/help/scrub
+++ b/test/resources/nodetool/help/scrub
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] scrub
                 [(-j <jobs> | --jobs <jobs>)] [(-n | --no-validate)]
@@ -28,9 +28,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/setauthcacheconfig b/test/resources/nodetool/help/setauthcacheconfig
index 5e97efc020..aa9f787100 100644
--- a/test/resources/nodetool/help/setauthcacheconfig
+++ b/test/resources/nodetool/help/setauthcacheconfig
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] setauthcacheconfig
                 [--cache-name <cache-name>] [--disable-active-update]
@@ -30,9 +30,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/setautorepairconfig b/test/resources/nodetool/help/setautorepairconfig
index aa034097b8..f3ef9a6c42 100644
--- a/test/resources/nodetool/help/setautorepairconfig
+++ b/test/resources/nodetool/help/setautorepairconfig
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] setautorepairconfig
                 [(-t <repairType> | --repair-type <repairType>)] [--]
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/setbatchlogreplaythrottle b/test/resources/nodetool/help/setbatchlogreplaythrottle
index f56bf4faf4..1f68e23ae9 100644
--- a/test/resources/nodetool/help/setbatchlogreplaythrottle
+++ b/test/resources/nodetool/help/setbatchlogreplaythrottle
@@ -5,7 +5,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] setbatchlogreplaythrottle
                 [--] <batchlog_replay_throttle>
@@ -17,9 +17,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/setcachecapacity b/test/resources/nodetool/help/setcachecapacity
index 0faed96219..663d7f7925 100644
--- a/test/resources/nodetool/help/setcachecapacity
+++ b/test/resources/nodetool/help/setcachecapacity
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] setcachecapacity [--]
                 <key-cache-capacity> <row-cache-capacity> <counter-cache-capacity>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/setcachekeystosave b/test/resources/nodetool/help/setcachekeystosave
index ec394a94a4..381c2aae1f 100644
--- a/test/resources/nodetool/help/setcachekeystosave
+++ b/test/resources/nodetool/help/setcachekeystosave
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] setcachekeystosave [--]
                 <key-cache-keys-to-save> <row-cache-keys-to-save>
@@ -17,9 +17,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/setcolumnindexsize b/test/resources/nodetool/help/setcolumnindexsize
index 916848acaf..48c43a440b 100644
--- a/test/resources/nodetool/help/setcolumnindexsize
+++ b/test/resources/nodetool/help/setcolumnindexsize
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] setcolumnindexsize [--]
                 <column_index_size>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/setcompactionthreshold b/test/resources/nodetool/help/setcompactionthreshold
index 3a2ab45fdb..7ea3c0ef98 100644
--- a/test/resources/nodetool/help/setcompactionthreshold
+++ b/test/resources/nodetool/help/setcompactionthreshold
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] setcompactionthreshold [--]
                 <keyspace> <table> <minthreshold> <maxthreshold>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/setcompactionthroughput b/test/resources/nodetool/help/setcompactionthroughput
index a619d45083..8a663ef91e 100644
--- a/test/resources/nodetool/help/setcompactionthroughput
+++ b/test/resources/nodetool/help/setcompactionthroughput
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] setcompactionthroughput [--]
                 <compaction_throughput>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/setconcurrency b/test/resources/nodetool/help/setconcurrency
index c736f7f313..66427c6da3 100644
--- a/test/resources/nodetool/help/setconcurrency
+++ b/test/resources/nodetool/help/setconcurrency
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] setconcurrency [--]
                 <stage-name> <maximum-concurrency> | <stage-name> <core-pool>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/setconcurrentcompactors b/test/resources/nodetool/help/setconcurrentcompactors
index 52aeb589a4..fd8ce39961 100644
--- a/test/resources/nodetool/help/setconcurrentcompactors
+++ b/test/resources/nodetool/help/setconcurrentcompactors
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] setconcurrentcompactors [--]
                 <concurrent_compactors>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/setconcurrentviewbuilders b/test/resources/nodetool/help/setconcurrentviewbuilders
index 2428ff1476..389a8a47e2 100644
--- a/test/resources/nodetool/help/setconcurrentviewbuilders
+++ b/test/resources/nodetool/help/setconcurrentviewbuilders
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] setconcurrentviewbuilders
                 [--] <concurrent_view_builders>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/setdefaultrf b/test/resources/nodetool/help/setdefaultrf
index 0a8662bc56..fc1e905936 100644
--- a/test/resources/nodetool/help/setdefaultrf
+++ b/test/resources/nodetool/help/setdefaultrf
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] setdefaultrf [--] <default_rf>
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/setguardrailsconfig b/test/resources/nodetool/help/setguardrailsconfig
index 4804c42829..ea990908d5 100644
--- a/test/resources/nodetool/help/setguardrailsconfig
+++ b/test/resources/nodetool/help/setguardrailsconfig
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] setguardrailsconfig [--]
                 [<setter> <value1> ...]
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/sethintedhandoffthrottlekb b/test/resources/nodetool/help/sethintedhandoffthrottlekb
index 99a595adb7..447d40cd11 100644
--- a/test/resources/nodetool/help/sethintedhandoffthrottlekb
+++ b/test/resources/nodetool/help/sethintedhandoffthrottlekb
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] sethintedhandoffthrottlekb
                 [--] <throttle_in_kb>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/setinterdcstreamthroughput b/test/resources/nodetool/help/setinterdcstreamthroughput
index 8f41a06481..38f3ce71e8 100644
--- a/test/resources/nodetool/help/setinterdcstreamthroughput
+++ b/test/resources/nodetool/help/setinterdcstreamthroughput
@@ -5,7 +5,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] setinterdcstreamthroughput
                 [(-e | --entire-sstable-throughput)] [(-m | --mib)] [--]
@@ -24,9 +24,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/setlogginglevel b/test/resources/nodetool/help/setlogginglevel
index a63c60ff7a..060d43e8eb 100644
--- a/test/resources/nodetool/help/setlogginglevel
+++ b/test/resources/nodetool/help/setlogginglevel
@@ -5,7 +5,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] setlogginglevel [--]
                 <component|class> <level>
@@ -17,9 +17,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/setmaxhintwindow b/test/resources/nodetool/help/setmaxhintwindow
index 68615cc51c..54024e2ab5 100644
--- a/test/resources/nodetool/help/setmaxhintwindow
+++ b/test/resources/nodetool/help/setmaxhintwindow
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] setmaxhintwindow [--]
                 <max_hint_window>
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/setsnapshotthrottle b/test/resources/nodetool/help/setsnapshotthrottle
index e7bae46934..8a88ba8f65 100644
--- a/test/resources/nodetool/help/setsnapshotthrottle
+++ b/test/resources/nodetool/help/setsnapshotthrottle
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] setsnapshotthrottle [--]
                 <throttle>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/setstreamthroughput b/test/resources/nodetool/help/setstreamthroughput
index 60a8cbeda9..0e8e1c86a6 100644
--- a/test/resources/nodetool/help/setstreamthroughput
+++ b/test/resources/nodetool/help/setstreamthroughput
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] setstreamthroughput
                 [(-e | --entire-sstable-throughput)] [(-m | --mib)] [--]
@@ -23,9 +23,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/settimeout b/test/resources/nodetool/help/settimeout
index c1c87c5b1c..4b07b18682 100644
--- a/test/resources/nodetool/help/settimeout
+++ b/test/resources/nodetool/help/settimeout
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] settimeout [--]
                 <timeout_type> <timeout_in_ms>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/settraceprobability b/test/resources/nodetool/help/settraceprobability
index 0ae7e29aef..12e302a861 100644
--- a/test/resources/nodetool/help/settraceprobability
+++ b/test/resources/nodetool/help/settraceprobability
@@ -5,7 +5,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] settraceprobability [--]
                 <trace_probability>
@@ -17,9 +17,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/sjk b/test/resources/nodetool/help/sjk
index fa0665bd4d..04b00ad3ce 100644
--- a/test/resources/nodetool/help/sjk
+++ b/test/resources/nodetool/help/sjk
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] sjk [--] <args>
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/snapshot b/test/resources/nodetool/help/snapshot
index d6a5b03c88..2651b23ddb 100644
--- a/test/resources/nodetool/help/snapshot
+++ b/test/resources/nodetool/help/snapshot
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] snapshot
                 [(-cf <table> | --column-family <table>)]
@@ -26,9 +26,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/sstablerepairedset b/test/resources/nodetool/help/sstablerepairedset
index 792afdab84..ac0872d849 100644
--- a/test/resources/nodetool/help/sstablerepairedset
+++ b/test/resources/nodetool/help/sstablerepairedset
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] sstablerepairedset
                 [--is-repaired] [--is-unrepaired] [--really-set] [--] <keyspace>
@@ -23,9 +23,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/status b/test/resources/nodetool/help/status
index a1955a417a..3fe77cdec9 100644
--- a/test/resources/nodetool/help/status
+++ b/test/resources/nodetool/help/status
@@ -3,11 +3,11 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] status
-                [(-o <sort_order> | --order <sort_order>)] [(-r | --resolve-ip)]
-                [(-s <sort> | --sort <sort>)] [--] <keyspace>
+                [(-o <sort_order> | --order <sort_order>)] [(-pp | --print-port)]
+                [(-r | --resolve-ip)] [(-s <sort> | --sort <sort>)] [--] <keyspace>
 
 OPTIONS
         -h <host>, --host <host>
diff --git a/test/resources/nodetool/help/statusautocompaction b/test/resources/nodetool/help/statusautocompaction
index 8afa2ef8eb..255230c54f 100644
--- a/test/resources/nodetool/help/statusautocompaction
+++ b/test/resources/nodetool/help/statusautocompaction
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] statusautocompaction
                 [(-a | --all)] [--] [<keyspace> <tables>...]
@@ -19,9 +19,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/statusbackup b/test/resources/nodetool/help/statusbackup
index 0160ecfcaf..fc9258a370 100644
--- a/test/resources/nodetool/help/statusbackup
+++ b/test/resources/nodetool/help/statusbackup
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] statusbackup
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/statusbinary b/test/resources/nodetool/help/statusbinary
index 54662f1faf..e27504c312 100644
--- a/test/resources/nodetool/help/statusbinary
+++ b/test/resources/nodetool/help/statusbinary
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] statusbinary
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/statusgossip b/test/resources/nodetool/help/statusgossip
index 25c3e78e2a..992e92ebe7 100644
--- a/test/resources/nodetool/help/statusgossip
+++ b/test/resources/nodetool/help/statusgossip
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] statusgossip
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/statushandoff b/test/resources/nodetool/help/statushandoff
index d9f756ff92..670a9fb9d8 100644
--- a/test/resources/nodetool/help/statushandoff
+++ b/test/resources/nodetool/help/statushandoff
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] statushandoff
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/stop b/test/resources/nodetool/help/stop
index f3bd55741b..edb55fa913 100644
--- a/test/resources/nodetool/help/stop
+++ b/test/resources/nodetool/help/stop
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] stop
                 [(-id <compactionId> | --compaction-id <compactionId>)] [--]
@@ -21,9 +21,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/stopdaemon b/test/resources/nodetool/help/stopdaemon
index bbfdeb0b41..6e603bdcda 100644
--- a/test/resources/nodetool/help/stopdaemon
+++ b/test/resources/nodetool/help/stopdaemon
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] stopdaemon
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/tablehistograms b/test/resources/nodetool/help/tablehistograms
index 69790ed21b..0558e44ed4 100644
--- a/test/resources/nodetool/help/tablehistograms
+++ b/test/resources/nodetool/help/tablehistograms
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] tablehistograms [--]
                 [<keyspace> <table> | <keyspace.table>]
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/tablestats b/test/resources/nodetool/help/tablestats
index 34971ab35c..3a7a326e64 100644
--- a/test/resources/nodetool/help/tablestats
+++ b/test/resources/nodetool/help/tablestats
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] tablestats
                 [(-F <format> | --format <format>)] [(-H | --human-readable)] [-i]
@@ -29,9 +29,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/toppartitions b/test/resources/nodetool/help/toppartitions
index e98eb4a04c..db7e75e5af 100644
--- a/test/resources/nodetool/help/toppartitions
+++ b/test/resources/nodetool/help/toppartitions
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] toppartitions [-a <samplers>]
                 [(-i <intervalMillis> | --interval <intervalMillis>)] [-k <topCount>]
@@ -30,9 +30,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/tpstats b/test/resources/nodetool/help/tpstats
index d18e31c4a7..3b048ecaa2 100644
--- a/test/resources/nodetool/help/tpstats
+++ b/test/resources/nodetool/help/tpstats
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] tpstats
                 [(-F <format> | --format <format>)] [(-v | --verbose)]
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/truncatehints b/test/resources/nodetool/help/truncatehints
index 62adeee8d4..a959939f4d 100644
--- a/test/resources/nodetool/help/truncatehints
+++ b/test/resources/nodetool/help/truncatehints
@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] truncatehints [--] [endpoint
                 ... ]
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/updatecidrgroup b/test/resources/nodetool/help/updatecidrgroup
index ea807b2423..756192c43a 100644
--- a/test/resources/nodetool/help/updatecidrgroup
+++ b/test/resources/nodetool/help/updatecidrgroup
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] updatecidrgroup [--]
                 [<cidrGroup> <cidr> ...]
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/upgradesstables b/test/resources/nodetool/help/upgradesstables
index 0d7fcd0576..1743dcac51 100644
--- a/test/resources/nodetool/help/upgradesstables
+++ b/test/resources/nodetool/help/upgradesstables
@@ -5,7 +5,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] upgradesstables
                 [(-a | --include-all-sstables)] [(-j <jobs> | --jobs <jobs>)]
@@ -27,9 +27,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/verify b/test/resources/nodetool/help/verify
index 2189d6e92a..b9ce6f3d42 100644
--- a/test/resources/nodetool/help/verify
+++ b/test/resources/nodetool/help/verify
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] verify
                 [(-c | --check-version)] [(-d | --dfp)] [(-e | --extended-verify)]
@@ -33,9 +33,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/version b/test/resources/nodetool/help/version
index 63a45bcc02..ded969c742 100644
--- a/test/resources/nodetool/help/version
+++ b/test/resources/nodetool/help/version
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] version [(-v | --verbose)]
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/resources/nodetool/help/viewbuildstatus b/test/resources/nodetool/help/viewbuildstatus
index 19395ca64b..483dd9e8d2 100644
--- a/test/resources/nodetool/help/viewbuildstatus
+++ b/test/resources/nodetool/help/viewbuildstatus
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] viewbuildstatus [--]
                 <keyspace> <view> | <keyspace.view>
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 
diff --git a/test/unit/org/apache/cassandra/tools/nodetool/NodetoolClassHierarchyTest.java b/test/unit/org/apache/cassandra/tools/nodetool/NodetoolClassHierarchyTest.java
index 64df57c021..9ab2daa953 100644
--- a/test/unit/org/apache/cassandra/tools/nodetool/NodetoolClassHierarchyTest.java
+++ b/test/unit/org/apache/cassandra/tools/nodetool/NodetoolClassHierarchyTest.java
@@ -19,6 +19,11 @@
 package org.apache.cassandra.tools.nodetool;
 
 import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.function.Consumer;
 
 import javax.inject.Inject;
 
@@ -31,8 +36,19 @@ import org.apache.cassandra.tools.Output;
 
 import picocli.CommandLine;
 
+import static org.junit.Assert.assertTrue;
+
 public class NodetoolClassHierarchyTest extends CQLTester
 {
+    /**
+     * Ensures no command in the nodetool hierarchy has duplicate {@code @Inject} fields
+     * for the same type across its class inheritance chain.
+     * <p>
+     * {@code AbstractCommand} declares {@code @Inject} ann for {@code INodeProbeFactory}
+     * and {@code Output}. If a subclass or any intermediate classes in the hierarchy
+     * redeclares an {@code @Inject} field of the same type, the picocli factory would
+     * inject both, leading to ambiguity and wasted resources.
+     */
     @Test
     public void testNoDuplicatesForInjectableFields() throws Exception
     {
@@ -72,4 +88,136 @@ public class NodetoolClassHierarchyTest extends CQLTester
                                          userObject.getClass().getCanonicalName());
         }
     }
+
+    /**
+     * Commands must be self-contained: every {@code @Option} and {@code @Parameters}
+     * a command needs must be declared on the command itself or via {@code @Mixin},
+     * not inherited through {@code @ParentCommand}. Self-contained commands can be
+     * instantiated and executed independently without walking the parent hierarchy,
+     * which is required for remote execution via CQL or MBean.
+     */
+    @Test
+    public void testNodetoolCommandsMustBeSelfContained()
+    {
+        CommandLine root = new CommandLine(NodetoolCommand.class);
+        Map<String, List<String>> affected = new TreeMap<>();
+
+        commandTreeWalker(root, cmd -> {
+            List<String> parentArgs = collectConsumedParentArgs(cmd);
+            if (!parentArgs.isEmpty())
+                affected.put(fullCommandName(cmd), parentArgs);
+        });
+
+        assertTrue("The following commands declare @ParentCommand and consume " +
+                   "options or parameters from a parent command: " + buildAffectedCommandMessage(affected),
+                   affected.isEmpty());
+    }
+
+    /**
+     * For a given command, follows the {@code @ParentCommand} chain and collects all
+     * options and parameters declared on each parent.
+     */
+    private static List<String> collectConsumedParentArgs(CommandLine cmd)
+    {
+        Object userObject = cmd.getCommandSpec().userObject();
+        if (userObject == null)
+            return List.of();
+
+        List<String> parentArgs = new ArrayList<>();
+        CommandLine currentCmd = cmd;
+        Class<?> currentClass = userObject.getClass();
+
+        while (true)
+        {
+            Field parentField = findAnnotatedField(currentClass);
+            if (parentField == null)
+                break;
+
+            CommandLine parentCmd = currentCmd.getParent();
+            if (parentCmd == null)
+                break;
+
+            addOptionsFromSpec(parentCmd, parentArgs);
+            addParametersFromSpec(parentCmd, parentArgs);
+
+            Object parentUserObject = parentCmd.getCommandSpec().userObject();
+            if (parentUserObject == null)
+                break;
+
+            currentCmd = parentCmd;
+            currentClass = parentUserObject.getClass();
+        }
+
+        return parentArgs;
+    }
+
+    private static void commandTreeWalker(CommandLine cmd, Consumer<CommandLine> consumer)
+    {
+        consumer.accept(cmd);
+        for (CommandLine sub : cmd.getSubcommands().values())
+            commandTreeWalker(sub, consumer);
+    }
+
+    private static Field findAnnotatedField(Class<?> clazz)
+    {
+        for (Class<?> c = clazz; c != null && c != Object.class; c = c.getSuperclass())
+        {
+            for (Field field : c.getDeclaredFields())
+            {
+                if (field.isAnnotationPresent(CommandLine.ParentCommand.class))
+                    return field;
+            }
+        }
+        return null;
+    }
+
+    private static void addOptionsFromSpec(CommandLine cmd, List<String> out)
+    {
+        for (CommandLine.Model.OptionSpec option : cmd.getCommandSpec().options())
+        {
+            if (option.usageHelp() || option.versionHelp())
+                continue;
+            out.add(String.format("option '%s': %s (%s)",
+                                  cmd.getCommandName(),
+                                  String.join("/", option.names()),
+                                  option.type().getSimpleName()));
+        }
+    }
+
+    private static void addParametersFromSpec(CommandLine cmd, List<String> out)
+    {
+        for (CommandLine.Model.PositionalParamSpec param : cmd.getCommandSpec().positionalParameters())
+        {
+            out.add(String.format("parameter '%s': %s index=%s (%s)",
+                                  cmd.getCommandName(),
+                                  param.paramLabel(),
+                                  param.index(),
+                                  param.type().getSimpleName()));
+        }
+    }
+
+    /** Build the full command path, e.g. {@code nodetool.removenode.status}. */
+    private static String fullCommandName(CommandLine cmd)
+    {
+        List<String> parts = new ArrayList<>();
+        CommandLine current = cmd;
+        while (current != null)
+        {
+            parts.add(0, current.getCommandName());
+            current = current.getParent();
+        }
+        return String.join(".", parts);
+    }
+
+    private static String buildAffectedCommandMessage(Map<String, List<String>> affected)
+    {
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, List<String>> entry : affected.entrySet())
+        {
+            sb.append("  Command: ").append(entry.getKey()).append('\n');
+            for (String detail : entry.getValue())
+                sb.append("    - ").append(detail).append('\n');
+        }
+        return sb.toString();
+    }
 }
diff --git a/test/unit/org/apache/cassandra/tools/nodetool/NodetoolPrintPortBackwardCompatibilityTest.java b/test/unit/org/apache/cassandra/tools/nodetool/NodetoolPrintPortBackwardCompatibilityTest.java
new file mode 100644
index 0000000000..3472a30962
--- /dev/null
+++ b/test/unit/org/apache/cassandra/tools/nodetool/NodetoolPrintPortBackwardCompatibilityTest.java
@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.tools.nodetool;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.apache.cassandra.cql3.CQLTester;
+import org.apache.cassandra.tools.ToolRunner;
+
+/**
+ * Verifies backward compatibility of the {@code -pp/--print-port} option placement.
+ * For each command in {@code PRINT_PORT_COMMANDS}, both syntaxes must succeed:
+ * <ul>
+ *   <li>{@code nodetool <command> --print-port} (natural picocli parsing via {@link PrintPortMixin})</li>
+ *   <li>{@code nodetool --print-port <command>} (backward-compatible relocation)</li>
+ * </ul>
+ * Commands that do not accept {@code --print-port} must reject it.
+ */
+@RunWith(Parameterized.class)
+public class NodetoolPrintPortBackwardCompatibilityTest extends CQLTester
+{
+    private static final String[] DEFAULT_STRING_ARRAY = new String[0];
+
+    @Parameterized.Parameter
+    public String command;
+
+    @Parameterized.Parameter(1)
+    public String[] extraArgs;
+
+    @Parameterized.Parameters(name = "{0}")
+    public static Collection<Object[]> data()
+    {
+        return List.of(
+            new Object[]{ "status", DEFAULT_STRING_ARRAY },
+            new Object[]{ "ring", DEFAULT_STRING_ARRAY },
+            new Object[]{ "netstats", DEFAULT_STRING_ARRAY },
+            new Object[]{ "gossipinfo", DEFAULT_STRING_ARRAY },
+            new Object[]{ "failuredetector", DEFAULT_STRING_ARRAY },
+            new Object[]{ "describecluster", DEFAULT_STRING_ARRAY },
+            new Object[]{ "describering", new String[]{ KEYSPACE } },
+            new Object[]{ "getendpoints", new String[]{ KEYSPACE, "pp_compat_tbl", "key1" } }
+        );
+    }
+
+    @BeforeClass
+    public static void setup() throws Exception
+    {
+        requireNetwork();
+        startJMXServer();
+    }
+
+    @Before
+    public void createTestData()
+    {
+        schemaChange("CREATE TABLE IF NOT EXISTS " + KEYSPACE + ".pp_compat_tbl (k text PRIMARY KEY)");
+    }
+
+    @Test
+    public void testPrintPortAfterSubcommand()
+    {
+        assertCleanExit(args(command, extraArgs));
+    }
+
+    @Test
+    public void testPrintPortBeforeSubcommand()
+    {
+        assertCleanExit(args("--print-port", command, extraArgs));
+    }
+
+    @Test
+    public void testShortOptionBeforeSubcommand()
+    {
+        assertCleanExit(args("-pp", command, extraArgs));
+    }
+
+    private static void assertCleanExit(String[] args)
+    {
+        ToolRunner.ToolResult result = ToolRunner.invokeNodetoolInJvm(args);
+        result.assertOnCleanExit();
+    }
+
+    private static String[] args(String first, String[] middle)
+    {
+        List<String> list = new ArrayList<>();
+        list.add(first);
+        list.addAll(List.of(middle));
+        list.add("--print-port");
+        return list.toArray(DEFAULT_STRING_ARRAY);
+    }
+
+    private static String[] args(String first, String second, String[] rest)
+    {
+        List<String> list = new ArrayList<>();
+        list.add(first);
+        list.add(second);
+        list.addAll(List.of(rest));
+        return list.toArray(DEFAULT_STRING_ARRAY);
+    }
+}
\ No newline at end of file
diff --git a/test/unit/org/apache/cassandra/tools/nodetool/StatusTest.java b/test/unit/org/apache/cassandra/tools/nodetool/StatusTest.java
index cc9c14deb4..b62398e455 100644
--- a/test/unit/org/apache/cassandra/tools/nodetool/StatusTest.java
+++ b/test/unit/org/apache/cassandra/tools/nodetool/StatusTest.java
@@ -93,6 +93,46 @@ public class StatusTest extends CQLTester
                 .contains("probably still bootstrapping. Effective ownership information is meaningless.");
     }
 
+    /**
+     * Verify that {@code -pp/--print-port} works in both positions:
+     * - {@code nodetool status -pp} natural picocli parsing via Mixin
+     * - {@code nodetool -pp status} backward compatibility relocation
+     */
+    @Test
+    public void testPrintPortOptionPositionBackwardCompatibility()
+    {
+        HostStatWithPort host = new HostStatWithPort(null, FBUtilities.getBroadcastAddressAndPort(), false, null);
+        String withPort = host.ipOrDns(true);
+        String withoutPort = host.ipOrDns(false);
+
+        ToolRunner.ToolResult baseline = ToolRunner.invokeNodetoolInJvm("status");
+        baseline.assertOnCleanExit();
+        assertThat(baseline.getStdout()).contains(withoutPort);
+
+        ToolRunner.ToolResult afterCmd = ToolRunner.invokeNodetoolInJvm("status", "-pp");
+        afterCmd.assertOnCleanExit();
+        assertThat(afterCmd.getStdout()).contains(withPort);
+
+        ToolRunner.ToolResult beforeCmd = ToolRunner.invokeNodetoolInJvm("-pp", "status");
+        beforeCmd.assertOnCleanExit();
+        assertThat(beforeCmd.getStdout()).contains(withPort);
+
+        assertThat(afterCmd.getStdout()).isEqualTo(beforeCmd.getStdout());
+
+        host = new HostStatWithPort(null, FBUtilities.getBroadcastAddressAndPort(), true, null);
+        withPort = host.ipOrDns(true);
+
+        afterCmd = ToolRunner.invokeNodetoolInJvm("status", "-r", "--print-port");
+        afterCmd.assertOnCleanExit();
+        assertThat(afterCmd.getStdout()).contains(withPort);
+
+        beforeCmd = ToolRunner.invokeNodetoolInJvm("--print-port", "status", "-r");
+        beforeCmd.assertOnCleanExit();
+        assertThat(beforeCmd.getStdout()).contains(withPort);
+
+        assertThat(afterCmd.getStdout()).isEqualTo(beforeCmd.getStdout());
+    }
+
     private void validateStatusOutput(String hostForm, String... args)
     {
         ToolRunner.ToolResult tool = ToolRunner.invokeNodetool(args);