Bug 848509 - Fix time editing when timezones are involved (don't merge me yet for debugging)