diff --git a/core/includes/module.inc b/core/includes/module.inc
index 1936355..bed5bc9 100644
--- a/core/includes/module.inc
+++ b/core/includes/module.inc
@@ -634,7 +634,11 @@ function module_uninstall($module_list = array(), $uninstall_dependents = TRUE)
     // Remove all configuration belonging to the module.
     $config_changes = $target_storage->listAll($module . '.');
     if (!empty($config_changes)) {
-      $config_changes = array('delete' => $config_changes);
+      $config_changes = array(
+        'delete' => $config_changes,
+        'change' => array(),
+        'create' => array(),
+      );
       $remaining_changes = config_import_invoke_owner($config_changes, $source_storage, $target_storage);
       config_sync_changes($remaining_changes, $source_storage, $target_storage);
     }
diff --git a/core/modules/config/config.admin.inc b/core/modules/config/config.admin.inc
index fa63964..30cc090 100644
--- a/core/modules/config/config.admin.inc
+++ b/core/modules/config/config.admin.inc
@@ -56,7 +56,7 @@ function config_admin_sync_form(array &$form, array &$form_state, StorageInterfa
 function config_admin_import_form($form, &$form_state) {
   // Retrieve a list of differences between FileStorage and the active store.
   $source_storage = new FileStorage();
-  $target_storage = drupal_container()->get('config.factory');
+  $target_storage = drupal_container()->get('config.storage');
 
   // Prevent users from deleting all configuration.
   // If the source storage is empty, that signals the unique condition of not
@@ -106,7 +106,7 @@ function config_admin_import_form_submit($form, &$form_state) {
  */
 function config_admin_export_form($form, &$form_state) {
   // Retrieve a list of differences between the active store and FileStorage.
-  $source_storage = drupal_container()->get('config.factory');
+  $source_storage = drupal_container()->get('config.storage');
   $target_storage = new FileStorage();
 
   config_admin_sync_form($form, $form_state, $source_storage, $target_storage);