diff --git a/data/js/tomahawk.js b/data/js/tomahawk.js
index 7f32ca1b5..a5efb28da 100644
--- a/data/js/tomahawk.js
+++ b/data/js/tomahawk.js
@@ -321,3 +321,5 @@ Tomahawk.hmac = function (key, message) {
 // some aliases
 Tomahawk.setTimeout = Tomahawk.setTimeout || window.setTimeout;
 Tomahawk.setInterval = Tomahawk.setInterval || window.setInterval;
+Tomahawk.base64Decode = window.atob;
+Tomahawk.base64Encode = window.btoa;
diff --git a/src/libtomahawk/resolvers/JSResolverHelper.cpp b/src/libtomahawk/resolvers/JSResolverHelper.cpp
index 07045ae01..9bc835db2 100644
--- a/src/libtomahawk/resolvers/JSResolverHelper.cpp
+++ b/src/libtomahawk/resolvers/JSResolverHelper.cpp
@@ -466,20 +466,6 @@ JSResolverHelper::reportUrlTranslation( const QString& qid, const QString& strea
 }
 
 
-QByteArray
-JSResolverHelper::base64Encode( const QByteArray& input )
-{
-    return input.toBase64();
-}
-
-
-QByteArray
-JSResolverHelper::base64Decode( const QByteArray& input )
-{
-    return QByteArray::fromBase64( input );
-}
-
-
 void
 JSResolverHelper::customIODeviceFactory( const Tomahawk::result_ptr&, const QString& url,
                                                boost::function< void( QSharedPointer< QIODevice >& ) > callback )
diff --git a/src/libtomahawk/resolvers/JSResolverHelper.h b/src/libtomahawk/resolvers/JSResolverHelper.h
index 2b632f81c..f03a43872 100644
--- a/src/libtomahawk/resolvers/JSResolverHelper.h
+++ b/src/libtomahawk/resolvers/JSResolverHelper.h
@@ -48,9 +48,6 @@ public:
     Q_INVOKABLE void addCustomUrlTranslator( const QString& protocol, const QString& callbackFuncName, const QString& isAsynchronous = "false" );
     Q_INVOKABLE void reportUrlTranslation( const QString& qid, const QString& streamUrl );
 
-    Q_INVOKABLE QByteArray base64Encode( const QByteArray& input );
-    Q_INVOKABLE QByteArray base64Decode( const QByteArray& input );
-
     void customIODeviceFactory( const Tomahawk::result_ptr&, const QString& url,
                                 boost::function< void( QSharedPointer< QIODevice >& ) > callback ); // async
     void customUrlTranslator( const Tomahawk::result_ptr&, const QString& url,