diff --git a/build.gradle b/build.gradle
index 2ae4d27fca..2b971d79a1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -203,6 +203,7 @@ dependencies {
     // uncomment for gplay, modified
     // implementation "com.google.firebase:firebase-messaging:${googleLibraryVersion}"
     // implementation "com.google.android.gms:play-services-base:${googleLibraryVersion}"
+    // implementation "com.google.android.gms:play-services-gcm:${googleLibraryVersion}"
     // implementation "com.google.firebase:firebase-core:${googleLibraryVersion}"
     implementation 'org.parceler:parceler-api:1.1.6'
     annotationProcessor 'org.parceler:parceler:1.1.6'
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 161300643e..3a5c2c906c 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -19,7 +19,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
           package="com.owncloud.android"
           android:versionCode="20000002"
           android:versionName="2.0.0RC2">
@@ -242,10 +241,6 @@
 
         <service android:name=".services.observer.FileObserverService" />
 
-        <service
-            android:name="com.evernote.android.job.gcm.PlatformGcmService"
-            tools:node="remove"/>
-
         <activity
             android:name=".ui.activity.CopyToClipboardActivity"
             android:icon="@drawable/copy_link"