Fix to group_by module as a result of previous conditional upgrades.