diff --git a/lib/ansible/playbook/__init__.py b/lib/ansible/playbook/__init__.py
index 94409ca7f83..69116d1e8bf 100644
--- a/lib/ansible/playbook/__init__.py
+++ b/lib/ansible/playbook/__init__.py
@@ -51,7 +51,7 @@ class PlayBook(object):
         remote_user      = C.DEFAULT_REMOTE_USER,
         remote_pass      = C.DEFAULT_REMOTE_PASS,
         sudo_pass        = C.DEFAULT_SUDO_PASS,
-        remote_port      = C.DEFAULT_REMOTE_PORT,
+        remote_port      = None,
         transport        = C.DEFAULT_TRANSPORT,
         private_key_file = C.DEFAULT_PRIVATE_KEY_FILE,
         callbacks        = None,
diff --git a/lib/ansible/runner/__init__.py b/lib/ansible/runner/__init__.py
index 023aa779fdd..07e8a001bda 100644
--- a/lib/ansible/runner/__init__.py
+++ b/lib/ansible/runner/__init__.py
@@ -382,7 +382,9 @@ class Runner(object):
 
         conn = None
         actual_host = inject.get('ansible_ssh_host', host)
-        actual_port = inject.get('ansible_ssh_port', port)
+        actual_port = port
+        if self.transport in ['paramiko', 'ssh' ]:
+            actual_port = inject.get('ansible_ssh_port', port)
 
         # the delegated host may have different SSH port configured, etc
         # and we need to transfer those, and only those, variables