Fixes https://drupal.org/node/2189953