3 files changed, 4 insertions, 5 deletions
diff --git a/lib/private/AllConfig.php b/lib/private/AllConfig.php
index 601a5f113dc..745bab367d3 100644
--- a/lib/private/AllConfig.php
+++ b/lib/private/AllConfig.php
@@ -163,7 +163,7 @@ class AllConfig implements \OCP\IConfig {
 	 * @param string|float|int $value the value that should be stored
 	 */
 	public function setAppValue($appName, $key, $value) {
-		\OC::$server->getAppConfig()->setValue($appName, $key, $value);
+		\OC::$server->query(\OC\AppConfig::class)->setValue($appName, $key, $value);
 	}
 
 	/**
diff --git a/lib/private/AppConfig.php b/lib/private/AppConfig.php
index 62a2f8b3c99..59a340cb491 100644
--- a/lib/private/AppConfig.php
+++ b/lib/private/AppConfig.php
@@ -162,7 +162,6 @@ class AppConfig implements IAppConfig {
 	 * @param string $key key
 	 * @param string|float|int $value value
 	 * @return bool True if the value was inserted or updated, false if the value was the same
-	 * @deprecated 8.0.0 use method setAppValue of \OCP\IConfig
 	 */
 	public function setValue($app, $key, $value) {
 		if (!$this->hasKey($app, $key)) {
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 306d2667bca..ea44ac8a144 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -298,12 +298,12 @@ class OC_App {
 			$appData['types'] = [];
 		}
 
-		\OC::$server->getAppConfig()->setValue($app, 'types', $appTypes);
+		\OC::$server->getConfig()->setAppValue($app, 'types', $appTypes);
 
 		if (\OC::$server->getAppManager()->hasProtectedAppType($appData['types'])) {
 			$enabled = \OC::$server->getConfig()->getAppValue($app, 'enabled', 'yes');
 			if ($enabled !== 'yes' && $enabled !== 'no') {
-				\OC::$server->getAppConfig()->setValue($app, 'enabled', 'yes');
+				\OC::$server->getConfig()->setAppValue($app, 'enabled', 'yes');
 			}
 		}
 	}
@@ -1075,7 +1075,7 @@ class OC_App {
 		self::setAppTypes($appId);
 
 		$version = \OC_App::getAppVersion($appId);
-		\OC::$server->getAppConfig()->setValue($appId, 'installed_version', $version);
+		\OC::$server->getConfig()->setAppValue($appId, 'installed_version', $version);
 
 		\OC::$server->getEventDispatcher()->dispatch(ManagerEvent::EVENT_APP_UPDATE, new ManagerEvent(
 			ManagerEvent::EVENT_APP_UPDATE, $appId