diff --git a/core/Application.php b/core/Application.php
index dad7546dcb..5a2bc477fe 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -32,9 +32,6 @@ namespace OC\Core;
 
 use OC\Security\IdentityProof\Manager;
 use OCP\AppFramework\App;
-use OC\Core\Controller\CssController;
-use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\IRequest;
 use OCP\Util;
 
 /**
@@ -58,13 +55,5 @@ class Application extends App {
 				\OC::$server->getCrypto()
 			);
 		});
-		$container->registerService(CssController::class, function () use ($container) {
-			return new CssController(
-				$container->query('appName'),
-				$container->query(IRequest::class),
-				\OC::$server->getAppDataDir('css'),
-				$container->query(ITimeFactory::class)
-			);
-		});
 	}
 }
diff --git a/core/Controller/CssController.php b/core/Controller/CssController.php
index 57197e9999..3cf477290f 100644
--- a/core/Controller/CssController.php
+++ b/core/Controller/CssController.php
@@ -21,6 +21,7 @@
 
 namespace OC\Core\Controller;
 
+use OC\Files\AppData\Factory;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\NotFoundResponse;
@@ -43,13 +44,13 @@ class CssController extends Controller {
 	/**
 	 * @param string $appName
 	 * @param IRequest $request
-	 * @param IAppData $appData
+	 * @param Factory $appDataFactory
 	 * @param ITimeFactory $timeFactory
 	 */
-	public function __construct($appName, IRequest $request, IAppData $appData, ITimeFactory $timeFactory) {
+	public function __construct($appName, IRequest $request, Factory $appDataFactory, ITimeFactory $timeFactory) {
 		parent::__construct($appName, $request);
 
-		$this->appData = $appData;
+		$this->appData = $appDataFactory->get('css');
 		$this->timeFactory = $timeFactory;
 	}
 
diff --git a/tests/Core/Controller/CssControllerTest.php b/tests/Core/Controller/CssControllerTest.php
index 30bbc12809..c78233d891 100644
--- a/tests/Core/Controller/CssControllerTest.php
+++ b/tests/Core/Controller/CssControllerTest.php
@@ -23,7 +23,7 @@
 namespace Tests\Core\Controller;
 
 use OC\Core\Controller\CssController;
-use OC\HintException;
+use OC\Files\AppData\Factory;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\FileDisplayResponse;
 use OCP\AppFramework\Http\NotFoundResponse;
@@ -40,7 +40,7 @@ class CssControllerTest extends TestCase {
 	/** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */
 	private $appData;
 
-	/** @var IRequests|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */
 	private $request;
 
 	/** @var CssController */
@@ -49,8 +49,15 @@ class CssControllerTest extends TestCase {
 	public function setUp() {
 		parent::setUp();
 
+		/** @var Factory|\PHPUnit_Framework_MockObject_MockObject $factory */
+		$factory = $this->createMock(Factory::class);
 		$this->appData = $this->createMock(IAppData::class);
+		$factory->expects($this->once())
+			->method('get')
+			->with('css')
+			->willReturn($this->appData);
 
+		/** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject $timeFactory */
 		$timeFactory = $this->createMock(ITimeFactory::class);
 		$timeFactory->method('getTime')
 			->willReturn(1337);
@@ -60,7 +67,7 @@ class CssControllerTest extends TestCase {
 		$this->controller = new CssController(
 			'core',
 			$this->request,
-			$this->appData,
+			$factory,
 			$timeFactory
 		);
 	}