Remove duplicate function and harmonize with upstream Drupal/Pressflow

This looks to have been our bad resolving a conflict on the 6.30 release.

Fixes issue #7