Fix timezone handling again