diff --git a/core/modules/block/src/BlockForm.php b/core/modules/block/src/BlockForm.php
index 23d6ca0..fada7e0 100644
--- a/core/modules/block/src/BlockForm.php
+++ b/core/modules/block/src/BlockForm.php
@@ -100,7 +100,6 @@ public function form(array $form, FormStateInterface $form_state) {
     if (!$theme = $entity->get('theme')) {
       $theme = $this->config('system.theme')->get('default');
     }
-    $form_state->set('block_theme', $theme);
 
     // Store the gathered contexts in the form state for other objects to use
     // during form building.
diff --git a/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php b/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
index 6d10aff..37c5f23 100644
--- a/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
+++ b/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
@@ -83,20 +83,12 @@ public function defaultConfiguration() {
    * {@inheritdoc}
    */
   public function blockForm($form, FormStateInterface $form_state) {
-    // Get the theme.
-    $theme = $form_state->get('block_theme');
-
     // Get permissions.
     $url_system_theme_settings = new Url('system.theme_settings');
-    $url_system_theme_settings_theme = new Url('system.theme_settings_theme', array('theme' => $theme));
-
-    if ($url_system_theme_settings->access() && $url_system_theme_settings_theme->access()) {
-      // 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' => $url_system_theme_settings->toString(),
-        '@theme' => $url_system_theme_settings_theme->toString(),
-      ));
+    if ($url_system_theme_settings->access()) {
+      // 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' => $url_system_theme_settings->toString()));
     }
     else {
       // Explain that the user does not have access to the Appearance and Theme