Undo timezone stuff as it broke functionality
Merge conflict resolution