diff --git a/core/includes/form.inc b/core/includes/form.inc
index 1b58d1202ce52988ab4ccf0600c48499f0364e47..acb81e866106a93e133b6929fe19e9a290f07eb8 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -142,18 +142,6 @@ function drupal_build_form($form_id, &$form_state) {
   return \Drupal::formBuilder()->buildForm($form_id, $form_state);
 }
 
-/**
- * Constructs a new $form from the information in $form_state.
- *
- * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use \Drupal::formBuilder()->rebuildForm().
- *
- * @see \Drupal\Core\Form\FormBuilderInterface::rebuildForm().
- */
-function drupal_rebuild_form($form_id, &$form_state, $old_form = NULL) {
-  return \Drupal::formBuilder()->rebuildForm($form_id, $form_state, $old_form);
-}
-
 /**
  * Fetches a form from the cache.
  *
diff --git a/core/modules/system/src/Controller/FormAjaxController.php b/core/modules/system/src/Controller/FormAjaxController.php
index 4b5f78555237307ede9e50119ba161dbd14f4b3b..bc43c4906355aee8ad1c82f7fbd30a9e9fa9c8dd 100644
--- a/core/modules/system/src/Controller/FormAjaxController.php
+++ b/core/modules/system/src/Controller/FormAjaxController.php
@@ -90,7 +90,7 @@ protected function getForm(Request $request) {
 
     // When a form is rebuilt after Ajax processing, its #build_id and #action
     // should not change.
-    // @see drupal_rebuild_form()
+    // @see \Drupal\Core\Form\FormBuilderInterface::rebuildForm()
     $form_state['rebuild_info']['copy']['#build_id'] = TRUE;
     $form_state['rebuild_info']['copy']['#action'] = TRUE;
 
diff --git a/core/modules/system/src/Tests/Form/RebuildTest.php b/core/modules/system/src/Tests/Form/RebuildTest.php
index 7cba668f1302702a7e963517faac63c3d2705793..754a3033bc143393ad443a618a23b5d188074c59 100644
--- a/core/modules/system/src/Tests/Form/RebuildTest.php
+++ b/core/modules/system/src/Tests/Form/RebuildTest.php
@@ -11,7 +11,7 @@
 use Drupal\simpletest\WebTestBase;
 
 /**
- * Tests functionality of drupal_rebuild_form().
+ * Tests functionality of \Drupal\Core\Form\FormBuilderInterface::rebuildForm().
  *
  * @group Form
  * @todo Add tests for other aspects of form rebuilding.