diff --git a/apps/dav/lib/Connector/Sabre/Auth.php b/apps/dav/lib/Connector/Sabre/Auth.php
index 1610c554b9bba2b72f4e9e0f7d5ae0d59375876a..69821c63c211e4a207c99e96bb395317b28dd23a 100644
--- a/apps/dav/lib/Connector/Sabre/Auth.php
+++ b/apps/dav/lib/Connector/Sabre/Auth.php
@@ -104,14 +104,11 @@ class Auth extends AbstractBasic {
 		if ($this->userSession->isLoggedIn() &&
 			$this->isDavAuthenticated($this->userSession->getUser()->getUID())
 		) {
-			\OC_Util::setupFS($this->userSession->getUser()->getUID());
 			$this->session->close();
 			return true;
 		} else {
-			\OC_Util::setupFS(); //login hooks may need early access to the filesystem
 			try {
 				if ($this->userSession->logClientIn($username, $password, $this->request, $this->throttler)) {
-					\OC_Util::setupFS($this->userSession->getUser()->getUID());
 					$this->session->set(self::DAV_AUTHENTICATED, $this->userSession->getUser()->getUID());
 					$this->session->close();
 					return true;
diff --git a/apps/dav/tests/unit/Connector/Sabre/AuthTest.php b/apps/dav/tests/unit/Connector/Sabre/AuthTest.php
index 72800b842535fd38c28fe2bd46cbc0dc2f12c663..be841295f0b808f22bd069dc7bb28f681835ca9a 100644
--- a/apps/dav/tests/unit/Connector/Sabre/AuthTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/AuthTest.php
@@ -117,7 +117,7 @@ class AuthTest extends TestCase {
 		$user = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
-		$user->expects($this->exactly(2))
+		$user->expects($this->exactly(1))
 			->method('getUID')
 			->willReturn('MyTestUser');
 		$this->userSession
@@ -125,7 +125,7 @@ class AuthTest extends TestCase {
 			->method('isLoggedIn')
 			->willReturn(true);
 		$this->userSession
-			->expects($this->exactly(2))
+			->expects($this->exactly(1))
 			->method('getUser')
 			->willReturn($user);
 		$this->session
@@ -171,7 +171,7 @@ class AuthTest extends TestCase {
 		$user = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
-		$user->expects($this->exactly(3))
+		$user->expects($this->exactly(2))
 			->method('getUID')
 			->willReturn('MyTestUser');
 		$this->userSession
@@ -179,7 +179,7 @@ class AuthTest extends TestCase {
 			->method('isLoggedIn')
 			->willReturn(true);
 		$this->userSession
-			->expects($this->exactly(3))
+			->expects($this->exactly(2))
 			->method('getUser')
 			->willReturn($user);
 		$this->session
@@ -660,11 +660,11 @@ class AuthTest extends TestCase {
 		$user = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
-		$user->expects($this->exactly(3))
+		$user->expects($this->exactly(2))
 			->method('getUID')
 			->willReturn('MyTestUser');
 		$this->userSession
-			->expects($this->exactly(4))
+			->expects($this->exactly(3))
 			->method('getUser')
 			->willReturn($user);
 		$response = $this->auth->check($server->httpRequest, $server->httpResponse);