Applied https://drupal.org/comment/7858287#comment-7858287