Restore timezone handling CRM-10573
Merge pull request #838 from colemanw/CRM-10573

Restore timezone handling CRM-10573