DateTimeZone workarounds

Possible solution for #116.

Ah I guess I didn't fully read the comment, I thought it was just leftover debug code. But I'm happy with the current state =)