diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bbfe445b9..7f29928d1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -438,7 +438,7 @@
         <service
             android:name=".service.ImapAuthenticatorService"
             android:exported="true"
-            android:enabled="true"
+            android:enabled="false"
             >
             <intent-filter>
                 <action
@@ -566,20 +566,6 @@
                 android:resource="@xml/authenticator_alternate"
                 />
         </service>
-        <service
-            android:name=".service.ImapAuthenticatorService"
-            android:exported="true"
-            android:enabled="true"
-            >
-            <intent-filter>
-                <action
-                    android:name="android.accounts.AccountAuthenticator" />
-            </intent-filter>
-            <meta-data
-                android:name="android.accounts.AccountAuthenticator"
-                android:resource="@xml/authenticator_imap"
-                />
-        </service>
 
         <service
             android:name=".service.LegacyImapAuthenticatorService"