diff --git a/core/modules/user/lib/Drupal/user/RoleFormController.php b/core/modules/user/lib/Drupal/user/RoleFormController.php
index 1ee9b83..2269844 100644
--- a/core/modules/user/lib/Drupal/user/RoleFormController.php
+++ b/core/modules/user/lib/Drupal/user/RoleFormController.php
@@ -18,7 +18,8 @@ class RoleFormController extends EntityFormController {
   /**
    * {@inheritdoc}
    */
-  public function form(array $form, array &$form_state, EntityInterface $entity) {
+  public function form(array $form, array &$form_state) {
+    $entity = $this->entity;
     $form['label'] = array(
       '#type' => 'textfield',
       '#title' => t('Role name'),
@@ -51,10 +52,9 @@ public function form(array $form, array &$form_state, EntityInterface $entity) {
    * {@inheritdoc}
    */
   protected function actions(array $form, array &$form_state) {
-    $entity = $this->getEntity($form_state);
     $actions = parent::actions($form, $form_state);
     // Disable delete of new and built-in roles.
-    $actions['delete']['#access'] = !$entity->isNew() && !in_array($entity->id(), array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID));
+    $actions['delete']['#access'] = !$this->entity->isNew() && !in_array($this->entity->id(), array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID));
     return $actions;
   }
 
@@ -62,7 +62,7 @@ protected function actions(array $form, array &$form_state) {
    * {@inheritdoc}
    */
   public function save(array $form, array &$form_state) {
-    $entity = $this->getEntity($form_state);
+    $entity = $this->entity;
 
     // Prevent leading and trailing spaces in role names.
     $entity->set('label', trim($entity->label()));
@@ -82,8 +82,7 @@ public function save(array $form, array &$form_state) {
    * {@inheritdoc}
    */
   public function delete(array $form, array &$form_state) {
-    $entity = $this->getEntity($form_state);
-    $form_state['redirect'] = 'admin/people/roles/manage/' . $entity->id() . '/delete';
+    $form_state['redirect'] = 'admin/people/roles/manage/' . $this->entity->id() . '/delete';
   }
 
 }