Changed to the drupal.org codebase (7)