Drupal 7 port, for great justice!

Commented out code?