Patched version of module from drupal.org