diff --git a/apps/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php
index 9911aa37e3..270e3eedbf 100644
--- a/apps/user_ldap/tests/User_LDAPTest.php
+++ b/apps/user_ldap/tests/User_LDAPTest.php
@@ -489,13 +489,22 @@ class User_LDAPTest extends TestCase {
 		$this->assertEquals(0, count($result));
 	}
 
+	private function getUsers($search = '', $limit = null, $offset = null) {
+		$users = \OC::$server->getUserManager()->search($search, $limit, $offset);
+		$uids = [];
+		foreach ($users as $user) {
+			$uids[] = $user->getUID();
+		}
+		return $uids;
+	}
+
 	public function testGetUsersViaAPINoParam() {
 		$access = $this->getAccessMock();
 		$this->prepareAccessForGetUsers($access);
 		$backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock());
 		\OC_User::useBackend($backend);
 
-		$result = \OCP\User::getUsers();
+		$result = $this->getUsers();
 		$this->assertEquals(3, count($result));
 	}
 
@@ -505,7 +514,7 @@ class User_LDAPTest extends TestCase {
 		$backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock());
 		\OC_User::useBackend($backend);
 
-		$result = \OCP\User::getUsers('', 1, 2);
+		$result = $this->getUsers('', 1, 2);
 		$this->assertEquals(1, count($result));
 	}
 
@@ -515,7 +524,7 @@ class User_LDAPTest extends TestCase {
 		$backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock());
 		\OC_User::useBackend($backend);
 
-		$result = \OCP\User::getUsers('', 2, 1);
+		$result = $this->getUsers('', 2, 1);
 		$this->assertEquals(2, count($result));
 	}
 
@@ -525,7 +534,7 @@ class User_LDAPTest extends TestCase {
 		$backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock());
 		\OC_User::useBackend($backend);
 
-		$result = \OCP\User::getUsers('yo');
+		$result = $this->getUsers('yo');
 		$this->assertEquals(2, count($result));
 	}
 
@@ -535,7 +544,7 @@ class User_LDAPTest extends TestCase {
 		$backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock());
 		\OC_User::useBackend($backend);
 
-		$result = \OCP\User::getUsers('nix');
+		$result = $this->getUsers('nix');
 		$this->assertEquals(0, count($result));
 	}
 
diff --git a/lib/private/Encryption/Util.php b/lib/private/Encryption/Util.php
index fc0adbbd47..1f5a511c39 100644
--- a/lib/private/Encryption/Util.php
+++ b/lib/private/Encryption/Util.php
@@ -271,9 +271,12 @@ class Util {
 	}
 
 	public function getUserWithAccessToMountPoint($users, $groups) {
-		$result = array();
+		$result = [];
 		if (in_array('all', $users)) {
-			$result = \OCP\User::getUsers();
+			$users = $this->userManager->search('', null, null);
+			foreach ($users as $user) {
+				$result[] = $user->getUID();
+			}
 		} else {
 			$result = array_merge($result, $users);
 
diff --git a/lib/private/legacy/user.php b/lib/private/legacy/user.php
index 8f342281ad..07aa5a92f9 100644
--- a/lib/private/legacy/user.php
+++ b/lib/private/legacy/user.php
@@ -366,25 +366,6 @@ class OC_User {
 		}
 	}
 
-	/**
-	 * Get a list of all users
-	 *
-	 * @return array an array of all uids
-	 *
-	 * Get a list of all users.
-	 * @param string $search
-	 * @param integer $limit
-	 * @param integer $offset
-	 */
-	public static function getUsers($search = '', $limit = null, $offset = null) {
-		$users = \OC::$server->getUserManager()->search($search, $limit, $offset);
-		$uids = array();
-		foreach ($users as $user) {
-			$uids[] = $user->getUID();
-		}
-		return $uids;
-	}
-
 	/**
 	 * Get a list of all users display name
 	 *
diff --git a/lib/public/User.php b/lib/public/User.php
index 14fdd6fb1a..6e4e1d52a7 100644
--- a/lib/public/User.php
+++ b/lib/public/User.php
@@ -57,19 +57,6 @@ class User {
 		return \OC_User::getUser();
 	}
 
-	/**
-	 * Get a list of all users
-	 * @param string $search search pattern
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return array an array of all uids
-	 * @deprecated 8.1.0 use method search() of \OCP\IUserManager - \OC::$server->getUserManager()
-	 * @since 5.0.0
-	 */
-	public static function getUsers( $search = '', $limit = null, $offset = null ) {
-		return \OC_User::getUsers( $search, $limit, $offset );
-	}
-
 	/**
 	 * Get the user display name of the user currently logged in.
 	 * @param string|null $user user id or null for current user