SSP-2973 Revert unintentional Person Hibernate mapping changes