PIM-1597 Revert Group to entity