diff --git a/core/core.services.yml b/core/core.services.yml
index 89ea76d..7170275 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -67,10 +67,6 @@ services:
     factory_method: get
     factory_service: cache_factory
     arguments: [data]
-  config.cachedstorage.storage:
-    class: Drupal\Core\Config\FileStorage
-    factory_class: Drupal\Core\Config\FileStorageFactory
-    factory_method: getActive
   config.manager:
     class: Drupal\Core\Config\ConfigManager
     arguments: ['@entity.manager', '@config.factory', '@config.typed', '@string_translation', '@config.storage']
diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index a704ebf..9cc33ec 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -326,12 +326,12 @@ function find_conf_path($http_host, $script_name, $require_settings = TRUE) {
  *
  * @param string $type
  *   (optional) The type of config directory to return. Drupal core provides
- *   'active' and 'staging'. Defaults to CONFIG_ACTIVE_DIRECTORY.
+ *   'active' and 'staging'. Defaults to CONFIG_STAGING_DIRECTORY.
  *
  * @return string
  *   The configuration directory path.
  */
-function config_get_config_directory($type = CONFIG_ACTIVE_DIRECTORY) {
+function config_get_config_directory($type = CONFIG_STAGING_DIRECTORY) {
   global $config_directories;
 
   if (!empty($config_directories[$type])) {
diff --git a/core/includes/file.inc b/core/includes/file.inc
index baaf654..6bc889f 100644
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -575,7 +575,6 @@ function file_ensure_htaccess() {
     file_save_htaccess('private://', TRUE);
   }
   file_save_htaccess('temporary://', TRUE);
-  file_save_htaccess(config_get_config_directory(), TRUE);
   file_save_htaccess(config_get_config_directory(CONFIG_STAGING_DIRECTORY), TRUE);
 }
 
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index d335e65..733d0b4 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -438,7 +438,7 @@ function install_begin_request(&$install_state) {
   // Ensure that the active configuration directory is empty before installation
   // starts.
   if ($install_state['config_verified'] && empty($task)) {
-    $config = glob(config_get_config_directory(CONFIG_ACTIVE_DIRECTORY) . '/*.' . FileStorage::getFileExtension());
+    $config =  Database::getConnection()->schema()->tableExists('config');;
     if (!empty($config)) {
       $task = NULL;
       throw new AlreadyInstalledException($container->get('string_translation'));
diff --git a/core/includes/install.inc b/core/includes/install.inc
index 6f61503..d694d10 100644
--- a/core/includes/install.inc
+++ b/core/includes/install.inc
@@ -177,10 +177,6 @@ function drupal_get_database_types() {
  *   and comment properties.
  *   @code
  *   $settings['config_directories'] = array(
- *     CONFIG_ACTIVE_DIRECTORY => (object) array(
- *       'value' => 'config_hash/active'
- *       'required' => TRUE,
- *     ),
  *     CONFIG_STAGING_DIRECTORY => (object) array(
  *       'value' => 'config_hash/staging',
  *       'required' => TRUE,
@@ -462,10 +458,6 @@ function drupal_install_config_directories() {
   if (empty($config_directories)) {
     $config_directories_hash = Crypt::randomBytesBase64(55);
     $settings['config_directories'] = array(
-      CONFIG_ACTIVE_DIRECTORY => (object) array(
-        'value' => conf_path() . '/files/config_' . $config_directories_hash . '/active',
-        'required' => TRUE,
-      ),
       CONFIG_STAGING_DIRECTORY => (object) array(
         'value' => conf_path() . '/files/config_' . $config_directories_hash . '/staging',
         'required' => TRUE,
@@ -476,7 +468,7 @@ function drupal_install_config_directories() {
   }
 
   // Ensure the config directories exist or can be created, and are writable.
-  foreach (array(CONFIG_ACTIVE_DIRECTORY, CONFIG_STAGING_DIRECTORY) as $config_type) {
+  foreach (array(CONFIG_STAGING_DIRECTORY) as $config_type) {
     // This should never fail, since if the config directory was specified in
     // settings.php it will have already been created and verified earlier, and
     // if it wasn't specified in settings.php, it is created here inside the
@@ -495,9 +487,6 @@ function drupal_install_config_directories() {
     // created, we have to write out the README rather than just adding it
     // to the drupal core repo.
     switch ($config_type) {
-      case CONFIG_ACTIVE_DIRECTORY:
-        $text = 'This directory contains the active configuration for your Drupal site. To move this configuration between environments, contents from this directory should be placed in the staging directory on the target server. To make this configuration active, see admin/config/development/configuration/sync on the target server.';
-        break;
       case CONFIG_STAGING_DIRECTORY:
         $text = 'This directory contains configuration to be imported into your Drupal site. To make this configuration active, see admin/config/development/configuration/sync.';
         break;
diff --git a/core/lib/Drupal/Core/DependencyInjection/UpdateServiceProvider.php b/core/lib/Drupal/Core/DependencyInjection/UpdateServiceProvider.php
index 4776214..44e66d1 100644
--- a/core/lib/Drupal/Core/DependencyInjection/UpdateServiceProvider.php
+++ b/core/lib/Drupal/Core/DependencyInjection/UpdateServiceProvider.php
@@ -31,8 +31,9 @@ public function register(ContainerBuilder $container) {
       // Prevent config from accessing {cache_config}.
       // @see $conf['cache_classes'], update_prepare_d8_bootstrap()
       $container
-        ->register('config.storage', 'Drupal\Core\Config\FileStorage')
-        ->addArgument(config_get_config_directory(CONFIG_ACTIVE_DIRECTORY));
+        ->register('config.storage', 'Drupal\Core\Config\DataBaseStorage')
+        ->addArgument(new Reference('database'))
+        ->addArgument('config');
       $container->register('module_handler', 'Drupal\Core\Extension\UpdateModuleHandler')
         ->addArgument('%container.modules%');
       $container
diff --git a/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationUiTest.php b/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationUiTest.php
index 405aaf5..cb07cd4 100644
--- a/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationUiTest.php
+++ b/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationUiTest.php
@@ -368,7 +368,6 @@ public function testContactConfigEntityTranslation() {
    */
   public function testDateFormatTranslation() {
     $this->drupalLogin($this->admin_user);
-    $file_storage = new FileStorage($this->configDirectories[CONFIG_ACTIVE_DIRECTORY]);
 
     $this->drupalGet('admin/config/regional/date-time');
 
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 0bd1942..fc74354 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -361,7 +361,6 @@ function system_requirements($phase) {
   // defined, the installer will create a valid config directory later, but
   // during runtime we must always display an error.
   if (!empty($GLOBALS['config_directories'])) {
-    $directories[] = config_get_config_directory(CONFIG_ACTIVE_DIRECTORY);
     $directories[] = config_get_config_directory(CONFIG_STAGING_DIRECTORY);
   }
   elseif ($phase != 'install') {