diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ba8e7d9..a6ff4873 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+- Do not explicitly disable ControlMaster option for device SSH connections
 - Fix issue when using resin deploy with non-standard stdin (e.g. git bash on windows)
 
 ## [6.0.0] - 2017-06-26
diff --git a/build/actions/local/promote.js b/build/actions/local/promote.js
index f34641f7..14336327 100644
--- a/build/actions/local/promote.js
+++ b/build/actions/local/promote.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.12.6
+// Generated by CoffeeScript 1.12.5
 
 /*
 Copyright 2017 Resin.io
@@ -51,7 +51,7 @@ module.exports = {
       _.assign(options, {
         deviceIp: deviceIp
       });
-      command = "ssh " + verbose + " -t -p " + options.port + " -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ControlMaster=no root@" + options.deviceIp + " -- \"resin-provision interactive\"";
+      command = "ssh " + verbose + " -t -p " + options.port + " -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null root@" + options.deviceIp + " -- \"resin-provision interactive\"";
       subShellCommand = getSubShellCommand(command);
       return child_process.spawn(subShellCommand.program, subShellCommand.args, {
         stdio: 'inherit'
diff --git a/build/actions/local/ssh.js b/build/actions/local/ssh.js
index 63248362..11a31e12 100644
--- a/build/actions/local/ssh.js
+++ b/build/actions/local/ssh.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.12.6
+// Generated by CoffeeScript 1.12.5
 
 /*
 Copyright 2017 Resin.io
@@ -76,7 +76,7 @@ module.exports = {
       return options.container;
     }).then(function(container) {
       var command, shellCmd, subShellCommand;
-      command = "ssh " + verbose + " -t -p " + options.port + " -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ControlMaster=no root@" + options.deviceIp;
+      command = "ssh " + verbose + " -t -p " + options.port + " -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null root@" + options.deviceIp;
       if (!options.host) {
         shellCmd = '/bin/sh -c $"\'if [ -e /bin/bash ]; then exec /bin/bash; else exec /bin/sh; fi\'"';
         command += " docker exec -ti " + container + " " + shellCmd;
diff --git a/build/actions/ssh.js b/build/actions/ssh.js
index a2ea5370..d737dd48 100644
--- a/build/actions/ssh.js
+++ b/build/actions/ssh.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.12.6
+// Generated by CoffeeScript 1.12.5
 
 /*
 Copyright 2016-2017 Resin.io
@@ -112,7 +112,7 @@ module.exports = {
         return Promise["try"](function() {
           var command, sshProxyCommand, subShellCommand;
           sshProxyCommand = getSshProxyCommand(hasTunnelBin);
-          command = "ssh " + verbose + " -t -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ControlMaster=no " + sshProxyCommand + " -p " + options.port + " " + username + "@ssh." + proxyUrl + " enter " + uuid + " " + containerId;
+          command = "ssh " + verbose + " -t -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null " + sshProxyCommand + " -p " + options.port + " " + username + "@ssh." + proxyUrl + " enter " + uuid + " " + containerId;
           subShellCommand = getSubShellCommand(command);
           return child_process.spawn(subShellCommand.program, subShellCommand.args, {
             stdio: 'inherit'
diff --git a/lib/actions/local/promote.coffee b/lib/actions/local/promote.coffee
index dc464b47..66524675 100644
--- a/lib/actions/local/promote.coffee
+++ b/lib/actions/local/promote.coffee
@@ -69,7 +69,6 @@ module.exports =
 				-o LogLevel=ERROR \
 				-o StrictHostKeyChecking=no \
 				-o UserKnownHostsFile=/dev/null \
-				-o ControlMaster=no \
 				root@#{options.deviceIp} \
 				-- \"resin-provision interactive\""
 
diff --git a/lib/actions/local/ssh.coffee b/lib/actions/local/ssh.coffee
index 238e2369..1908728f 100644
--- a/lib/actions/local/ssh.coffee
+++ b/lib/actions/local/ssh.coffee
@@ -97,7 +97,6 @@ module.exports =
 				-o LogLevel=ERROR \
 				-o StrictHostKeyChecking=no \
 				-o UserKnownHostsFile=/dev/null \
-				-o ControlMaster=no \
 				 root@#{options.deviceIp}"
 
 			if not options.host
diff --git a/lib/actions/ssh.coffee b/lib/actions/ssh.coffee
index 603b4ca3..e403090f 100644
--- a/lib/actions/ssh.coffee
+++ b/lib/actions/ssh.coffee
@@ -121,7 +121,6 @@ module.exports =
 						-o LogLevel=ERROR \
 						-o StrictHostKeyChecking=no \
 						-o UserKnownHostsFile=/dev/null \
-						-o ControlMaster=no \
 						#{sshProxyCommand} \
 						-p #{options.port} #{username}@ssh.#{proxyUrl} enter #{uuid} #{containerId}"