Added a temporary workaround for https://drupal.org/node/2282453.