LPS-50131 Refactor TimeZoneUtil

@willnewbury will unit test it to prevent it from happening again.