Branch blocker: $form_state changes per change notice https://www.drupal.org/node/2310411