diff --git a/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/SASLXOauth2Mechanism.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/SASLXOauth2Mechanism.java
index a271f01a7..e066fb87d 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/SASLXOauth2Mechanism.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/SASLXOauth2Mechanism.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2014-2015 Florian Schmaus
+ * Copyright 2014-2016 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ import javax.security.auth.callback.CallbackHandler;
 
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.sasl.SASLMechanism;
-import org.jivesoftware.smack.util.stringencoder.Base64;
 
 /**
  * The SASL X-OAUTH2 mechanism as described in <a
@@ -72,8 +71,8 @@ public class SASLXOauth2Mechanism extends SASLMechanism {
 
     @Override
     protected byte[] getAuthenticationText() throws SmackException {
-        // base64("\0" + user_name + "\0" + oauth_token)
-        return Base64.encode(toBytes('\u0000' + authenticationId + '\u0000' + password));
+        // Note that base64 encoding is done in SASLMechanism for the bytes return by getAuthenticationText().
+        return toBytes('\u0000' + authenticationId + '\u0000' + password);
     }
 
     @Override