diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockListController.php b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockListController.php
index d4b37da..217e7ae 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockListController.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockListController.php
@@ -47,15 +47,4 @@ public function getOperations(EntityInterface $entity) {
     return $operations;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function render() {
-    $build = parent::render();
-    // Override the default 'There is no Custom Block yet' to 'There are no
-    // Custom Blocks yet'.
-    $build['#empty'] = t('There are no @labels yet.', array('@label' => $this->entityInfo['label']));
-    return $build;
-  }
-
 }
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockListTest.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockListTest.php
index 8488718..935e229 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockListTest.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockListTest.php
@@ -112,7 +112,7 @@ public function testListing() {
     $this->assertNoFieldByXpath('//td', 'Albatross', "No label found for deleted 'Albatross' entity.");
 
     // Confirm that the empty text is displayed.
-    $this->assertText(t('There are no Custom Blocks yet.'));
+    $this->assertText(t('There is no Custom Block yet.'));
   }
 
 }