Updated for https://www.drupal.org/node/2315237.