Fix timezone handling again.  Closes issue #11