Fix timezone issues

Re-config needed.
Revert "Fix timezone issues"

This reverts commit b8596409cbf3581f632494cd689e4fef997f1ace.
Fix Timezone issues

Reconfig needed
Fix Timezone issues part2