CC-6 #comment Patch ahah_helper module from https://www.drupal.org/node/1371792