diff --git a/core/includes/batch.inc b/core/includes/batch.inc
index 68fc14b5cf9600cba1c9cdf0d7d3263500255fc4..9e693f54f2459963c483095caf98f491d4a21b7b 100644
--- a/core/includes/batch.inc
+++ b/core/includes/batch.inc
@@ -270,8 +270,8 @@ function _batch_process() {
     // through the remaining sets, marking them 'successfully processed'
     // along the way, until we find a set that contains operations.
     // _batch_next_set() executes form submit handlers stored in 'control'
-    // sets (see form_execute_handlers()), which can in turn add new sets to
-    // the batch.
+    // sets (see \Drupal::service('form_submitter')), which can in turn add new
+    // sets to the batch.
     $set_changed = FALSE;
     $old_set = $current_set;
     while (empty($current_set['count']) && ($current_set['success'] = TRUE) && _batch_next_set()) {
diff --git a/core/lib/Drupal/Core/Entity/ContentEntityForm.php b/core/lib/Drupal/Core/Entity/ContentEntityForm.php
index 75c4927393831b225562adabf8589191154bfb68..9f96efa5b9ced4533cf27252f468d047395bfab7 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityForm.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityForm.php
@@ -65,7 +65,7 @@ public function validate(array $form, FormStateInterface $form_state) {
     // @todo Remove this.
     // Execute legacy global validation handlers.
     $form_state->setValidateHandlers([]);
-    form_execute_handlers('validate', $form, $form_state);
+    \Drupal::service('form_validator')->executeValidateHandlers($form, $form_state);
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Entity/EntityForm.php b/core/lib/Drupal/Core/Entity/EntityForm.php
index 25acfab241892c0cc12b8a4c2a33b4be9139b7c5..301b5ae3d2f3bfcc7c8cf5a2c2aef64dfc636971 100644
--- a/core/lib/Drupal/Core/Entity/EntityForm.php
+++ b/core/lib/Drupal/Core/Entity/EntityForm.php
@@ -226,7 +226,7 @@ public function validate(array $form, FormStateInterface $form_state) {
     // @todo Remove this.
     // Execute legacy global validation handlers.
     $form_state->setValidateHandlers([]);
-    form_execute_handlers('validate', $form, $form_state);
+    \Drupal::service('form_validator')->executeValidateHandlers($form, $form_state);
   }
 
   /**