tested and apparently working in Drupal 7 now