If the zone until happens at the exact time of the rule change, use the previous zone's offset (4/104646)

Actually commiting correctly