diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index bf8ef66..5f09e86 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1106,8 +1106,8 @@ function install_settings_form_submit($form, &$form_state) {
   global $install_state;
 
   // Update global settings array and save.
-  $settings['databases'] = (object) array(
-    'value'    => array('default' => array('default' => $form_state['storage']['database'])),
+  $settings['databases']['default']['default'] = (object) array(
+    'value'    => $form_state['storage']['database'],
     'required' => TRUE,
   );
   $settings['drupal_hash_salt'] = (object) array(
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index e066efb..f27ccb1 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -341,22 +341,6 @@ function system_requirements($phase) {
     }
   }
 
-  // Check the config directory if it is defined in settings.php. If it isn't
-  // 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') {
-    $requirements['config directories'] = array(
-      'title' => $t('Configuration directories'),
-      'value' => $t('Not present'),
-      'description' => $t('Your %file file must define the $config_directories variable as an array containing the name of a directories in which configuration files can be written.', array('%file' => conf_path() . '/settings.php')),
-      'severity' => REQUIREMENT_ERROR,
-    );
-  }
-
   $requirements['file system'] = array(
     'title' => $t('File system'),
   );