Re-add dropped timezones from commit e1af7d4e23100c01d17e671bfe72c46ca25c113c