diff --git a/src/main/java/com/github/shyiko/mysql/binlog/network/ClientCapabilities.java b/src/main/java/com/github/shyiko/mysql/binlog/network/ClientCapabilities.java
index 4eefa16c..c744d5a9 100644
--- a/src/main/java/com/github/shyiko/mysql/binlog/network/ClientCapabilities.java
+++ b/src/main/java/com/github/shyiko/mysql/binlog/network/ClientCapabilities.java
@@ -42,7 +42,6 @@ public final class ClientCapabilities {
     public static final int MULTI_RESULTS = 1 << 17; /* enable/disable multi-results */
     public static final int PS_MULTI_RESULTS = 1 << 18; /* multi-results in ps-protocol */
     public static final int PLUGIN_AUTH = 1 << 19; /* client supports plugin authentication */
-    public static final int PLUGIN_AUTH_LEN_ENC = 1 << 21;
     public static final int SSL_VERIFY_SERVER_CERT = 1 << 30;
     public static final int REMEMBER_OPTIONS = 1 << 31;
 
diff --git a/src/main/java/com/github/shyiko/mysql/binlog/network/protocol/GreetingPacket.java b/src/main/java/com/github/shyiko/mysql/binlog/network/protocol/GreetingPacket.java
index 79473929..943f8fb1 100644
--- a/src/main/java/com/github/shyiko/mysql/binlog/network/protocol/GreetingPacket.java
+++ b/src/main/java/com/github/shyiko/mysql/binlog/network/protocol/GreetingPacket.java
@@ -81,7 +81,4 @@ public int getServerCollation() {
         return serverCollation;
     }
 
-    public void setScramble(String s) {
-        this.scramble = s;
-    }
 }
diff --git a/src/main/java/com/github/shyiko/mysql/binlog/network/protocol/command/AuthenticateCommand.java b/src/main/java/com/github/shyiko/mysql/binlog/network/protocol/command/AuthenticateCommand.java
index 39b04673..a045fe24 100644
--- a/src/main/java/com/github/shyiko/mysql/binlog/network/protocol/command/AuthenticateCommand.java
+++ b/src/main/java/com/github/shyiko/mysql/binlog/network/protocol/command/AuthenticateCommand.java
@@ -55,14 +55,10 @@ public byte[] toByteArray() throws IOException {
         int clientCapabilities = this.clientCapabilities;
         if (clientCapabilities == 0) {
             clientCapabilities = ClientCapabilities.LONG_FLAG |
-                    ClientCapabilities.PROTOCOL_41 |
-                    ClientCapabilities.SECURE_CONNECTION |
-                    ClientCapabilities.LONG_PASSWORD |
-                    ClientCapabilities.PLUGIN_AUTH;
+                    ClientCapabilities.PROTOCOL_41 | ClientCapabilities.SECURE_CONNECTION;
             if (schema != null) {
                 clientCapabilities |= ClientCapabilities.CONNECT_WITH_DB;
             }
-            clientCapabilities |= ClientCapabilities.PLUGIN_AUTH_LEN_ENC;
         }
         buffer.writeInteger(clientCapabilities, 4);
         buffer.writeInteger(0, 4); // maximum packet length
@@ -77,7 +73,6 @@ public byte[] toByteArray() throws IOException {
         if (schema != null) {
             buffer.writeZeroTerminatedString(schema);
         }
-        buffer.writeZeroTerminatedString("mysql_native_password");
         return buffer.toByteArray();
     }