Fix changing between timezone and non-timezone