diff --git a/eoptasks/eoptasks.py b/eoptasks/eoptasks.py
index 94be214..4ec59a7 100755
--- a/eoptasks/eoptasks.py
+++ b/eoptasks/eoptasks.py
@@ -220,8 +220,7 @@ def command_window(args):
     orig_cmd = cmd
     while True:
         # -t: force a tty for interactive commands.
-        # -S none: disable connection sharing as it proved unreliable.
-        rc = subprocess.call(['ssh', '-t', '-o', 'ControlMaster=no', '-S', 'none', args.command_server_name] + [cmd])
+        rc = subprocess.call(['ssh', '-t', args.command_server_name] + [cmd])
         if rc == 0:
             send_status_message(tmux_session_name,
                     {'@type': 'server-result',