diff --git a/libraries/ESP8266WiFi/src/WiFiClient.cpp b/libraries/ESP8266WiFi/src/WiFiClient.cpp
index 333ebd94a..35777e2d0 100644
--- a/libraries/ESP8266WiFi/src/WiFiClient.cpp
+++ b/libraries/ESP8266WiFi/src/WiFiClient.cpp
@@ -40,16 +40,6 @@ extern "C"
 #include "include/ClientContext.h"
 #include "c_types.h"
 
-
-#define NO_PORT_BIND
-
-#ifndef NO_PORT_BIND
-#define MIN_LOCAL_PORT 1024
-#define MAX_LOCAL_PORT 1124
-
-static int g_localPort = MIN_LOCAL_PORT;
-#endif
-
 ICACHE_FLASH_ATTR WiFiClient::WiFiClient() 
 : _client(0)
 {
@@ -102,22 +92,7 @@ int ICACHE_FLASH_ATTR  WiFiClient::connect(IPAddress ip, uint16_t port)
     tcp_pcb* pcb = tcp_new();
     if (!pcb)
         return 0;
-#ifndef NO_PORT_BIND
-    while(true)
-    {
-        err_t err = tcp_bind(pcb, INADDR_ANY, g_localPort);
-        if (++g_localPort == MAX_LOCAL_PORT)
-            g_localPort = MIN_LOCAL_PORT;
-        if (err == ERR_OK)
-            break;
-        if (err == ERR_USE) {
-        	esp_yield();
-            continue;
-        }
-        tcp_abort(pcb);
-        return 0;
-    }
-#endif
+
     ip_addr_t addr;
     addr.addr = ip;
     tcp_arg(pcb, this);