FS-5382 --resolve remove the hardcoded timezone.