Reverting timezone changes until a proper solution is investigated