diff --git a/core/modules/config/config.info b/core/modules/config/config.info
index 9e73fa1..380f17e 100644
--- a/core/modules/config/config.info
+++ b/core/modules/config/config.info
@@ -3,7 +3,3 @@ description = Allows administrators to manage configuration changes.
 package = Core
 version = VERSION
 core = 8.x
-; @todo D8: Config module is required for all modules that implement
-;   ConfigEntityBase. Move the entity system and ConfigEntity* into a
-;   Drupal\Core component to remove this required dependency.
-required = TRUE
diff --git a/core/modules/contact/contact.info b/core/modules/contact/contact.info
index eff6d33..d703c4f 100644
--- a/core/modules/contact/contact.info
+++ b/core/modules/contact/contact.info
@@ -3,4 +3,5 @@ description = Enables the use of both personal and site-wide contact forms.
 package = Core
 version = VERSION
 core = 8.x
+dependencies[] = config
 configure = admin/structure/contact
diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module
index 34678f7..5a16be5 100644
--- a/core/modules/contact/contact.module
+++ b/core/modules/contact/contact.module
@@ -204,8 +204,8 @@ function contact_config_import_delete($name, $new_config, $old_config) {
 function contact_entity_info() {
   $types['contact_category'] = array(
     'label' => 'Category',
-    'controller class' => 'Drupal\config\ConfigStorageController',
     'entity class' => 'Drupal\contact\Category',
+    'controller class' => 'Drupal\config\ConfigStorageController',
     'config prefix' => 'contact.category',
     'entity keys' => array(
       'id' => 'id',