Revert "Merge pull request #12633 from senny/no_more_time_zone_leaks"

This reverts commit e60c925982cc693bde2f97ef846b4f8904d41c23.