As a bunch of folks noticed I don't zone_idx does what you think it does. That being said I'm very happy about any kind of validation (except maybe in a supper hot path). So if we want to validate the zone number we can do, just not as in this patch.