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