diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 62710f1bdb4493ca7c7e34aff81bcdf17ca7799d..cb2a5bcd4ae63165d6e96bcf2bef137e717ea849 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -3261,13 +3261,10 @@ class LUConnectConsole(NoHooksLU):
 
     hyper = hypervisor.GetHypervisor()
     console_cmd = hyper.GetShellCommandForConsole(instance)
+
     # build ssh cmdline
-    argv = ["ssh", "-q", "-t"]
-    argv.extend(ssh.KNOWN_HOSTS_OPTS)
-    argv.extend(ssh.BATCH_MODE_OPTS)
-    argv.append(node)
-    argv.append(console_cmd)
-    return "ssh", argv
+    cmd = self.ssh.BuildCmd(node, "root", console_cmd, batch=True, tty=True)
+    return cmd[0], cmd
 
 
 class LUAddMDDRBDComponent(LogicalUnit):