Also - https://github.com/civicrm/civicrm-drupal/pull/90/files to re-add for d7