Fix for https://drupal.org/node/2079895.