Issue #2302867 by DamienMcKenna: Resolve problems in hook_entity_load().