Include Etc/UTC in workaround