Bug 1104806 - timezone refactor