diff --git a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
index 48b53bded49d24cb79fb39944aee3c046ef57149..251b9205bba230905f6911bbef93e9d05af0346f 100644
--- a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
@@ -116,10 +116,8 @@ public function onRespond(FilterResponseEvent $event) {
     $response->headers->set('X-Frame-Options', 'SAMEORIGIN', FALSE);
 
     // Expose the cache contexts and cache tags associated with this page in a
-    // X-Drupal-Cache-Contexts and X-Drupal-Cache-Tags header respectively, when
-    // either a reverse proxy is being used (so the reverse proxy or CDN can be
-    // invalidated when appropriate) or when developing/debugging.
-    if ((Settings::get('reverse_proxy', FALSE) || Settings::get('send_cacheability_headers', FALSE)) && $response instanceof CacheableResponseInterface) {
+    // X-Drupal-Cache-Contexts and X-Drupal-Cache-Tags header respectively.
+    if ($response instanceof CacheableResponseInterface) {
       $response_cacheability = $response->getCacheableMetadata();
       $response->headers->set('X-Drupal-Cache-Tags', implode(' ', $response_cacheability->getCacheTags()));
       $response->headers->set('X-Drupal-Cache-Contexts', implode(' ', $this->cacheContextsManager->optimizeTokens($response_cacheability->getCacheContexts())));
diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php
index c11b73b31662666aa8687f882f35a84eaedcd1ff..cc3b2700646c8bdd8bc6ce24d09aa7d6411a500a 100644
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -742,13 +742,6 @@ protected function prepareSettings() {
       'value' => FALSE,
       'required' => TRUE,
     ];
-
-    // Send cacheability headers so tests can check their values.
-    $settings['settings']['send_cacheability_headers'] = (object) [
-      'value' => TRUE,
-      'required' => TRUE,
-    ];
-
     $this->writeSettings($settings);
     // Allow for test-specific overrides.
     $settings_testing_file = DRUPAL_ROOT . '/' . $this->originalSite . '/settings.testing.php';
diff --git a/sites/example.settings.local.php b/sites/example.settings.local.php
index 0711fb910717c8f04eadc902f40dc6bd093230c1..34b4e191c193c6f614627cc36dfd2b663798496e 100644
--- a/sites/example.settings.local.php
+++ b/sites/example.settings.local.php
@@ -58,13 +58,6 @@
  */
 $settings['cache']['bins']['render'] = 'cache.backend.null';
 
-/**
- * Send cacheablity headers for debugging purposes.
- *
- * By default, cacheability headers are only sent when behind a reverse proxy.
- */
-$settings['send_cacheability_headers'] = TRUE;
-
 /**
  * Allow test modules and themes to be installed.
  *