Reapply drupal7.entity-system.1525176-143.patch