diff --git a/core/modules/block/src/BlockForm.php b/core/modules/block/src/BlockForm.php
index 1249dab..72bfaa8 100644
--- a/core/modules/block/src/BlockForm.php
+++ b/core/modules/block/src/BlockForm.php
@@ -74,7 +74,6 @@ public function form(array $form, array &$form_state) {
     if (!$theme = $entity->get('theme')) {
       $theme = $this->config('system.theme')->get('default');
     }
-    $form_state['block_theme'] = $theme;
 
     $form['#tree'] = TRUE;
     $form['settings'] = $entity->getPlugin()->buildConfigurationForm(array(), $form_state);
diff --git a/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php b/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
index 13e1b7f..52faf10 100644
--- a/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
+++ b/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
@@ -106,9 +106,6 @@ public function defaultConfiguration() {
    * {@inheritdoc}
    */
   public function blockForm($form, &$form_state) {
-    // Get the theme.
-    $theme = $form_state['block_theme'];
-
     // Get permissions.
     $administer_themes_access = $this->currentUser->hasPermission('administer themes');
     $administer_site_configuration_access = $this->currentUser->hasPermission('administer site configuration');
@@ -116,11 +113,9 @@ public function blockForm($form, &$form_state) {
     if ($administer_themes_access) {
       // Get paths to theme settings pages.
       $appearance_settings_url = $this->urlGenerator->generateFromRoute('system.theme_settings');
-      $theme_settings_url = $this->urlGenerator->generateFromRoute('system.theme_settings_theme', array('theme' => $theme));
-
-      // Provide links to the Appearance Settings and Theme Settings pages
-      // if the user has access to administer themes.
-      $site_logo_description = $this->t('Defined on the <a href="@appearance">Appearance Settings</a> or <a href="@theme">Theme Settings</a> page.', array('@appearance' => $appearance_settings_url, '@theme' => $theme_settings_url));
+      // Provide links to the Appearance Settings page if the user has access to
+      // administer themes.
+      $site_logo_description = $this->t('Defined on the <a href="@appearance">Appearance Settings</a> page.', array('@appearance' => $appearance_settings_url));
     }
     else {
       // Explain that the user does not have access to the Appearance and Theme