Apply https://drupal.org/node/2246725