diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 2f4366017..fc3ca89db 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -74,7 +74,6 @@ public AsyncHttpClient(AsyncServer server) {
         insertMiddleware(socketMiddleware = new AsyncSocketMiddleware(this));
         insertMiddleware(sslSocketMiddleware = new SpdyMiddleware(this));
         insertMiddleware(httpTransportMiddleware = new HttpTransportMiddleware());
-        sslSocketMiddleware.addEngineConfigurator(new SSLEngineSNIConfigurator());
     }
 
     @SuppressLint("NewApi")
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
index 4c7cd322c..200d03dab 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
@@ -69,7 +69,7 @@ protected SSLEngine createConfiguredSSLEngine(GetSocketData data, String host, i
         }
 
         if (sslEngine == null)
-            sslEngine = sslContext.createSSLEngine();
+            sslEngine = sslContext.createSSLEngine(host, port);
 
         for (AsyncSSLEngineConfigurator configurator : engineConfigurators) {
             configurator.configureEngine(sslEngine, data, host, port);