Accounts for https://drupal.org/node/2075873.