Applying a patch from Drupal.org