diff --git a/library/build.gradle b/library/build.gradle
index 5752a2f0edb96b88f46576ef6db7b296c970fdc5..00bdbf91b1a878af098dfbf44a92783148da1ea1 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -47,7 +47,7 @@ configurations {
 
 def versionMajor = 1
 def versionMinor = 0
-def versionPatch = 7
+def versionPatch = 8
 def upstreamVersion = "2.17"
 def releasePatch = "release"
 def libName = "Nextcloud-Android-Library"
diff --git a/library/src/main/java/com/nextcloud/common/OkHttpMethodBase.kt b/library/src/main/java/com/nextcloud/common/OkHttpMethodBase.kt
index adb52013524e9240bf01559a55e94fbd3f037fa9..e3c80f155d012fd3fbe7d3d399389750335ac40f 100644
--- a/library/src/main/java/com/nextcloud/common/OkHttpMethodBase.kt
+++ b/library/src/main/java/com/nextcloud/common/OkHttpMethodBase.kt
@@ -147,11 +147,6 @@ abstract class OkHttpMethodBase(
             temp.header(RemoteOperation.OCS_API_HEADER, RemoteOperation.OCS_API_HEADER_VALUE)
         }
 
-        if (nextcloudClient.oidcLoginWithToken) {
-            temp.header(RemoteOperation.OIDC_LOGIN_WITH_TOKEN, "true")
-            temp.header(RemoteOperation.OCS_API_HEADER, "true")
-        }
-
         applyType(temp)
 
         val request = temp.build()
diff --git a/library/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java b/library/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
index 9fea5ed96b9423a4f5d79355af1975a8214bf5d5..1534004ec8cf9750ba518cddc8ee08e7386c0603 100644
--- a/library/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/library/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -31,7 +31,6 @@ import com.nextcloud.common.DNSCache;
 import com.nextcloud.common.NextcloudUriDelegate;
 import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.network.RedirectionPath;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import org.apache.commons.httpclient.Cookie;
@@ -238,8 +237,6 @@ public class OwnCloudClient extends HttpClient {
     private void addBearerCredentialIfRequired(HttpMethod method) {
         if (credentials instanceof OwnCloudBearerCredentials) {
             method.setRequestHeader("Authorization", "Bearer " + credentials.getAuthToken());
-            method.setRequestHeader(RemoteOperation.OIDC_LOGIN_WITH_TOKEN, "true");
-            method.setRequestHeader(RemoteOperation.OCS_API_HEADER, "true");
         }
     }
 
diff --git a/library/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperation.java
index b940244aa12530ff9d6ff78879d6b1dff17a3bda..b2299f4211e271532d2e40bc82b51248708937c1 100644
--- a/library/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperation.java
@@ -68,6 +68,7 @@ public abstract class RemoteOperation<T> implements Runnable {
      * OCS API header value
      */
     public static final String OCS_API_HEADER_VALUE = "true";
+    public static final String OIDC_LOGIN_WITH_TOKEN_VALUE = "true";
 
     public static final String CONTENT_TYPE = "Content-Type";
     public static final String FORM_URLENCODED = "application/x-www-form-urlencoded";