diff --git a/core/lib/Drupal/Core/ExceptionController.php b/core/lib/Drupal/Core/ExceptionController.php
index c8c6a34..ebbdf2a 100644
--- a/core/lib/Drupal/Core/ExceptionController.php
+++ b/core/lib/Drupal/Core/ExceptionController.php
@@ -138,7 +138,7 @@ public function on404Html(FlattenException $exception, Request $request) {
     watchdog('page not found', check_plain($request->attributes->get('system_path')), NULL, WATCHDOG_WARNING);
 
     // Check for and return a fast 404 page if configured.
-    $config = config('system.fast_404');
+    $config = config('system.performance')->get('fast_404');
 
     $exclude_paths = $config->get('exclude_paths');
     if ($config->get('enabled') && $exclude_paths && !preg_match($exclude_paths, $request->getPathInfo())) {
diff --git a/core/modules/system/config/system.fast_404.yml b/core/modules/system/config/system.fast_404.yml
deleted file mode 100644
index 731c8bb..0000000
--- a/core/modules/system/config/system.fast_404.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-enabled: '1'
-paths: '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i'
-exclude_paths: '/\/(?:styles)\//'
-html: '<!DOCTYPE html><html><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>'
diff --git a/core/modules/system/config/system.performance.yml b/core/modules/system/config/system.performance.yml
index 80f349a..0188032 100644
--- a/core/modules/system/config/system.performance.yml
+++ b/core/modules/system/config/system.performance.yml
@@ -5,6 +5,11 @@ cache:
 css:
   preprocess: '0'
   gzip: '1'
+fast_404:
+  enabled: '1'
+  paths: '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i'
+  exclude_paths: '/\/(?:styles|imagecache)\//'
+  html: '<!DOCTYPE html><html><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>'
 js:
   preprocess: '0'
   gzip: '1'
@@ -12,4 +17,3 @@ response:
   gzip: '0'
 stale_file_threshold: '2592000'
 theme_link: '1'
-
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/SystemUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/SystemUpgradePathTest.php
index 73a2977..ddb97ca 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/SystemUpgradePathTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/SystemUpgradePathTest.php
@@ -55,6 +55,12 @@ public function testVariableUpgrade() {
       'response.gzip' => '1',
       'js.preprocess' => '1',
       'css.preprocess' => '1',
+      'fast_404' => array(
+        'enabled' => '1',
+        'paths' => '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|aspi|pdf)$/i',
+        'exclude_paths' => '/\/(?:styles|imagecache)\//',
+        'html' => '<!DOCTYPE html><html><head><title>Page Not Found</title></head><body><h1>Page Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>',
+      ),
     );
 
     $expected_config['system.rss'] = array(
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index c21d62a..f15b163 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -2003,10 +2003,10 @@ function system_update_8043() {
  * @ingroup config_upgrade
  */
 function system_update_8044() {
-  update_variables_to_config('system.fast_404', array(
-    '404_fast_html' => 'html',
-    '404_fast_paths' => 'paths',
-    '404_fast_paths_exclude' => 'exclude_paths',
+  update_variables_to_config('system.performance', array(
+    'fast_404_html' => 'fast_404.html',
+    'fast_404_paths' => 'fast_404.paths',
+    'fast_404_paths_exclude' => 'fast_404.exclude_paths',
   ));
 }
 
diff --git a/core/modules/system/tests/upgrade/drupal-7.system.database.php b/core/modules/system/tests/upgrade/drupal-7.system.database.php
index be9f54c..f423091 100644
--- a/core/modules/system/tests/upgrade/drupal-7.system.database.php
+++ b/core/modules/system/tests/upgrade/drupal-7.system.database.php
@@ -119,6 +119,18 @@
     'name' => 'actions_max_stack',
     'value' => 'i:42;',
   ))
+->values(array(
+  'name' => 'fast_404_paths',
+  'value' => 's:74:"/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|aspi|pdf)$/i";',
+))
+->values(array(
+  'name' => 'fast_404_excluded_paths',
+  'value' => 's:27:"/\/(?:styles|imagecache)\//";',
+))
+->values(array(
+  'name' => 'fast_404_html',
+  'value' => 's:168:"<!DOCTYPE html><html><head><title>Page Not Found</title></head><body><h1>Page Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>";',
+))
 ->execute();
 
 db_update('variable')
