diff --git a/core/includes/module.inc b/core/includes/module.inc
index cbdbeaf..981b083 100644
--- a/core/includes/module.inc
+++ b/core/includes/module.inc
@@ -6,6 +6,7 @@
  */
 
 use Drupal\Component\Graph\Graph;
+use Drupal\Core\Config\FileStorage;
 
 /**
  * Loads all the modules that have been enabled in the system table.
@@ -624,6 +625,18 @@ function module_uninstall($module_list = array(), $uninstall_dependents = TRUE)
     module_invoke($module, 'uninstall');
     drupal_uninstall_schema($module);
 
+    // Remove any stray configuration settings.
+    // Get the names of default configurations provided by this module
+    // by scanning its config directory.
+    $module_config_dir = drupal_get_path('module', $module) . '/config';
+    if (is_dir($module_config_dir)) {
+      $files = glob($module_config_dir . '/*.' . FileStorage::getFileExtension());
+      foreach ($files as $file) {
+        $config_name = basename($file, '.' . FileStorage::getFileExtension());
+        config($config_name)->delete();
+      }
+    }
+
     // Remove all configuration belonging to the module.
     $config_names = $storage->listAll($module . '.');
     foreach ($config_names as $config_name) {