This updates the change made in d227d54e to use the system time zone rather
than the global time zone.