diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockDeleteForm.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockDeleteForm.php
index 1755b19..b8d4f83 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockDeleteForm.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockDeleteForm.php
@@ -7,12 +7,13 @@
 
 namespace Drupal\custom_block\Form;
 
-use Drupal\Core\Entity\EntityConfirmFormBase;
+use Drupal\Core\Entity\EntityNGConfirmFormBase;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Provides a confirmation form for deleting a custom block entity.
  */
-class CustomBlockDeleteForm extends EntityConfirmFormBase {
+class CustomBlockDeleteForm extends EntityNGConfirmFormBase {
 
   /**
    * {@inheritdoc}
@@ -46,7 +47,7 @@ public function getConfirmText() {
    * {@inheritdoc}
    */
   public function buildForm(array $form, array &$form_state, Request $request = NULL) {
-    $form = parent::buildForm($form, $form_state);
+    $form = parent::buildForm($form, $form_state, $request);
     $instances = $this->entity->getInstances();
 
     $form['message'] = array(