Add latency grouping back again with the new scheme.