diff --git a/core/modules/block/block.install b/core/modules/block/block.install
index 5505d89..2a38bd5 100644
--- a/core/modules/block/block.install
+++ b/core/modules/block/block.install
@@ -65,7 +65,7 @@ function block_update_8001() {
       $block->set('visibility', $visibility);
 
       if ($backup_values) {
-        $block->set('2528178_visibility', $backup_values);
+        $block->set('visibility_2528178', $backup_values);
       }
     }
 
diff --git a/core/modules/block/config/schema/block.schema.yml b/core/modules/block/config/schema/block.schema.yml
index d3590a4..c2dcfd8 100644
--- a/core/modules/block/config/schema/block.schema.yml
+++ b/core/modules/block/config/schema/block.schema.yml
@@ -30,7 +30,7 @@ block.block.*:
       sequence:
         type: condition.plugin.[id]
         label: 'Visibility Condition'
-    2528178_visibility:
+    visibility_2528178:
       type: sequence
       label: 'Missing conversions of 2528178'
       sequence:
diff --git a/core/modules/block/src/Entity/Block.php b/core/modules/block/src/Entity/Block.php
index d2b3031..471aac7 100644
--- a/core/modules/block/src/Entity/Block.php
+++ b/core/modules/block/src/Entity/Block.php
@@ -48,6 +48,7 @@
  *     "plugin",
  *     "settings",
  *     "visibility",
+ *     "visibility_2528178",
  *   },
  *   lookup_keys = {
  *     "theme"
@@ -99,6 +100,13 @@ class Block extends ConfigEntityBase implements BlockInterface, EntityWithPlugin
   protected $visibility = [];
 
   /**
+   * Missing visibility contexts from the 2528178 update.
+   *
+   * @var array
+   */
+  protected $visibility_2528178 = [];
+
+  /**
    * The plugin collection that holds the block plugin for this entity.
    *
    * @var \Drupal\block\BlockPluginCollection
diff --git a/core/modules/block/src/Tests/Update/BlockContextMappingUpdateTest.php b/core/modules/block/src/Tests/Update/BlockContextMappingUpdateTest.php
index 149e2aa..3b3bdf7 100644
--- a/core/modules/block/src/Tests/Update/BlockContextMappingUpdateTest.php
+++ b/core/modules/block/src/Tests/Update/BlockContextMappingUpdateTest.php
@@ -79,7 +79,7 @@ public function testUpdateHookN() {
     // still be edited afterward.
     $disabled_block = Block::load('thirdtestfor2354889');
     $this->assertFalse($disabled_block->status(), 'Block with invalid context is disabled');
-    $this->assertEqual(['baloney.spam'], $disabled_block->get('2528178_visibility'));
+    $this->assertEqual(['baloney.spam'], $disabled_block->get('visibility_2528178'));
 
     $disabled_block_visibility = $disabled_block->get('visibility');
     $this->assertTrue(!isset($disabled_block_visibility['node_type']), 'The problematic visibility condition has been removed.');