diff --git a/src/Resources/config/services.yaml b/src/Resources/config/services.yaml
index e574c6467fdad2cade8daaec2761138ee388c3a2..c5bd7a0945820ac9352b038d092caa681269cda1 100644
--- a/src/Resources/config/services.yaml
+++ b/src/Resources/config/services.yaml
@@ -6,6 +6,3 @@ services:
 
   Dbp\Relay\BasePersonBundle\API\PersonProviderInterface:
     '@Dbp\Relay\BasePersonConnectorLdapBundle\Service\LDAPPersonProvider'
-
-  Dbp\Relay\AuthBundle\API\UserRolesInterface:
-    '@Dbp\Relay\BasePersonConnectorLdapBundle\Service\CustomUserRoles'
diff --git a/src/Service/CustomUserRoles.php b/src/Service/CustomUserRoles.php
deleted file mode 100644
index 2c1634c90f59a6d72679e1331f1a3291ecbc6ea1..0000000000000000000000000000000000000000
--- a/src/Service/CustomUserRoles.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Dbp\Relay\BasePersonConnectorLdapBundle\Service;
-
-use Dbp\Relay\AuthBundle\API\UserRolesInterface;
-
-class CustomUserRoles implements UserRolesInterface
-{
-    private $ldap;
-
-    public function __construct(LDAPApi $ldap)
-    {
-        $this->ldap = $ldap;
-    }
-
-    public function getRoles(?string $userIdentifier, array $scopes): array
-    {
-        // Convert all scopes to roles, like the default
-        $roles = [];
-        foreach ($scopes as $scope) {
-            $roles[] = 'ROLE_SCOPE_'.mb_strtoupper($scope);
-        }
-
-        // In case we have a real user also merge in roles from LDAP
-        if ($userIdentifier !== null) {
-            $personRoles = $this->ldap->getRolesForCurrentPerson();
-            $roles = array_merge($roles, $personRoles);
-            $roles = array_unique($roles);
-            sort($roles, SORT_STRING);
-        }
-
-        return $roles;
-    }
-}
diff --git a/src/Service/LDAPApi.php b/src/Service/LDAPApi.php
index ecc106eb80f555bbdcc64acfff858d8fef8bf251..dd8a44c11ae7fcbdfcefd45c3f06fb5b1d036e60 100644
--- a/src/Service/LDAPApi.php
+++ b/src/Service/LDAPApi.php
@@ -266,24 +266,6 @@ class LDAPApi implements LoggerAwareInterface, ServiceSubscriberInterface
         return $postEvent->getPerson();
     }
 
-    public function getRolesForCurrentPerson(): array
-    {
-        $person = $this->getCurrentPerson();
-        if ($person !== null) {
-            $roles = $person->getExtraData('ldap-roles');
-
-            if ($roles === null) {
-                return [];
-            }
-
-            assert(is_array($roles));
-
-            return $roles;
-        }
-
-        return [];
-    }
-
     public function getPerson(string $id): Person
     {
         $id = str_replace('/people/', '', $id);