LUGG-253 - removed core patch - re-evaluate https://drupal.org/node/1525176