Ported to Drupal 8 alpha 11