Simplify timezones state.
Fix revert command.