diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 04a0589..b24f93d 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -1742,7 +1742,7 @@ function views_form_block_form_alter(&$form, &$form_state) {
     unset($form['machine_name']['#machine_name']['source']);
     // Load the Views plugin object using form_state array and create a
     // block machine_name based on the View ID and View Display ID.
-    $block_plugin = $form_state['build_info']['callback_object']->getEntity()->getPlugin();
+    $block_plugin = $form_state['controller']->getEntity()->getPlugin();
     // Override the Views block's machine_name by providing a default_value.
     $form['machine_name']['#default_value'] = $block_plugin->generateBlockInstanceID(Drupal::entityManager()->getStorageController('block'));
     // Prevent users from changing the auto-generate block machine_name.