Why not always just serialize these also for 1.9 mode? Imho the 1.9 behavior is buggy so we can just go for the proper behavior right away. Also why does the zone need to be encoded with UTF-8?