Fixed #17262 -- Refactor tzinfo classes