"Shared timezones" not populating Forms correctly

[tomloveladyepd]

Noticed a minor niggle that's causing a couple of headaches, Because some of the timezones are using the same value (Auckland and Wellington in our case), When it comes to re-populating the form with the correct timezone, the value changes back to Auckland (in this specific case).

This also happens with a couple of Japanese timezones that are identified as Tokyo as well.

It's still showing the correct time when it's processed since they're both the same offset, was wondering what could be done about this?