Fixes issues caused by https://drupal.org/node/2169605.