diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index eac2f97..7753b4f 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -1397,7 +1397,7 @@ function drupal_serve_page_from_cache(stdClass $cache) {
   // response to reply to a subsequent request for a given URL without
   // revalidation. If a Vary header has been set in hook_boot(), it is assumed
   // that the module knows how to cache the page.
-  if (!isset($hook_boot_headers['vary']) && !variable_get('omit_vary_cookie')) {
+  if (!isset($hook_boot_headers['vary']) && !config('system.cache')->get('cookies.omit_vary')) {
     header('Vary: Cookie');
   }
 
diff --git a/core/modules/system/config/system.cache.yml b/core/modules/system/config/system.cache.yml
new file mode 100644
index 0000000..f89de3b
--- /dev/null
+++ b/core/modules/system/config/system.cache.yml
@@ -0,0 +1,2 @@
+cookies:
+  omit_vary: 'true'
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 44993ed..c804371 100755
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -429,24 +429,6 @@
 # $conf['reverse_proxy_header'] = 'HTTP_X_CLUSTER_CLIENT_IP';
 
 /**
- * Page caching:
- *
- * By default, Drupal sends a "Vary: Cookie" HTTP header for anonymous page
- * views. This tells a HTTP proxy that it may return a page from its local
- * cache without contacting the web server, if the user sends the same Cookie
- * header as the user who originally requested the cached page. Without "Vary:
- * Cookie", authenticated users would also be served the anonymous page from
- * the cache. If the site has mostly anonymous users except a few known
- * editors/administrators, the Vary header can be omitted. This allows for
- * better caching in HTTP proxies (including reverse proxies), i.e. even if
- * clients send different cookies, they still get content served from the cache.
- * However, authenticated users should access the site directly (i.e. not use an
- * HTTP proxy, and bypass the reverse proxy if one is used) in order to avoid
- * getting cached pages from the proxy.
- */
-# $conf['omit_vary_cookie'] = TRUE;
-
-/**
  * CSS/JS aggregated file gzip compression:
  *
  * By default, when CSS or JS aggregation and clean URLs are enabled Drupal will