Update for core change https://www.drupal.org/node/2329465.