ISO time zone removal handling BETA rev2