diff --git a/core/modules/color/color.module b/core/modules/color/color.module
index 019ab29..0269437 100644
--- a/core/modules/color/color.module
+++ b/core/modules/color/color.module
@@ -106,22 +106,6 @@ function color_library_info_alter(&$libraries, $extension) {
 }
 
 /**
- * Implements hook_preprocess_page().
- *
- * Replace the logo with the colored version if available.
- */
-function color_preprocess_page(&$variables) {
-  $theme_key = \Drupal::theme()->getActiveTheme()->getName();
-  $site_config = \Drupal::config('system.site');
-  $variables['logo'] = $site_config->get('logo');
-  // Override logo.
-  $logo = \Drupal::config('color.theme.' . $theme_key)->get('logo');
-  if ($logo && $variables['logo'] && preg_match('!' . $theme_key . '/logo.svg$!', $variables['logo'])) {
-    $variables['logo'] = file_create_url($logo);
-  }
-}
-
-/**
  * Retrieves the Color module information for a particular theme.
  */
 function color_get_info($theme) {
diff --git a/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php b/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
index b850bf2..2172ee3 100644
--- a/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
+++ b/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
@@ -166,10 +166,9 @@ public function build() {
     $build = array();
     $site_config = $this->configFactory->get('system.site');
 
-    $logo_url = theme_get_setting('logo.url');
     $build['site_logo'] = array(
       '#theme' => 'image',
-      '#uri' => $logo_url,
+      '#uri' => theme_get_setting('logo.url'),
       '#alt' => $this->t('Home'),
       '#access' => $this->configuration['use_site_logo'],
     );
diff --git a/core/modules/system/src/Tests/System/ThemeTest.php b/core/modules/system/src/Tests/System/ThemeTest.php
index a7ed207..0afb13f 100644
--- a/core/modules/system/src/Tests/System/ThemeTest.php
+++ b/core/modules/system/src/Tests/System/ThemeTest.php
@@ -115,7 +115,8 @@ function testThemeSettings() {
       $this->assertEqual((string) $elements[1], $explicit_file);
       $this->assertEqual((string) $elements[2], $local_file);
 
-      // Verify the actual 'src' attribute of the logo being output in a site branding block.
+      // Verify the actual 'src' attribute of the logo being output in a site
+      // branding block.
       $this->drupalPlaceBlock('system_branding_block', array('region' => 'header_first'));
       $this->drupalGet('');
       $elements = $this->xpath('//header//a[@rel=:rel]/img', array(
diff --git a/core/profiles/minimal/config/install/block.block.stark_branding.yml b/core/profiles/minimal/config/install/block.block.stark_branding.yml
index 789c2e3..59a8957 100644
--- a/core/profiles/minimal/config/install/block.block.stark_branding.yml
+++ b/core/profiles/minimal/config/install/block.block.stark_branding.yml
@@ -7,7 +7,7 @@ region: header_first
 plugin: system_branding_block
 settings:
   id: system_branding_block
-  label: 'Page Site Branding'
+  label: 'Site Branding'
   provider: system
   label_display: '0'
 dependencies:
diff --git a/core/profiles/standard/config/install/block.block.bartik_branding.yml b/core/profiles/standard/config/install/block.block.bartik_branding.yml
index aff7800..69a9b87 100644
--- a/core/profiles/standard/config/install/block.block.bartik_branding.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_branding.yml
@@ -7,7 +7,7 @@ region: header_first
 plugin: system_branding_block
 settings:
   id: system_branding_block
-  label: 'Page Site Branding'
+  label: 'Site Branding'
   provider: system
   label_display: '0'
 dependencies: