diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 669433e85a66c5cab99ef345579b087dde1af537..04122f4d136669219ffc32d57bd984be2943728c 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1638,8 +1638,8 @@ class LURunClusterCommand(NoHooksLU):
     """
     data = []
     for node in self.nodes:
-      result = utils.RunCmd(["ssh", node.name, self.op.command])
-      data.append((node.name, result.cmd, result.output, result.exit_code))
+      result = ssh.SSHCall(node.name, "root", self.op.command)
+      data.append((node.name, result.output, result.exit_code))
 
     return data
 
diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index 5e696336677d05e6236f22cad7385207a4e73ec1..171f5f5c81409a85e750c9804f19376947313e82 100755
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -140,10 +140,9 @@ def RunClusterCommand(opts, args):
   nodes = opts.nodes
   op = opcodes.OpRunClusterCommand(command=command, nodes=nodes)
   result = SubmitOpCode(op)
-  for node, sshcommand, output, exit_code in result:
+  for node, output, exit_code in result:
     print ("------------------------------------------------")
     print ("node: %s" % node)
-    print ("command: %s" % sshcommand)
     print ("%s" % output)
     print ("return code = %s" % exit_code)