Index: mobile/android/services/manifests/FxAccountAndroidManifest_services.xml.in
===================================================================
--- a/mobile/android/services/manifests/FxAccountAndroidManifest_services.xml.in
+++ b/mobile/android/services/manifests/FxAccountAndroidManifest_services.xml.in
@@ -1,20 +1,9 @@
-        <service
-            android:exported="true"
-            android:name="org.mozilla.gecko.fxa.authenticator.FxAccountAuthenticatorService" >
-            <intent-filter >
-                <action android:name="android.accounts.AccountAuthenticator" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.accounts.AccountAuthenticator"
-                android:resource="@xml/fxaccount_authenticator" />
-        </service>
-
+        <!-- Removed FxAccountAuthenticatorService from manifest. See https://issues.adblockplus.org/ticket/3994 -->
         <service
             android:exported="false"
             android:name="org.mozilla.gecko.fxa.receivers.FxAccountDeletedService" >
         </service>
 
         <service
             android:exported="false"
             android:name="org.mozilla.gecko.fxa.sync.FxAccountProfileService" >