Revert FX-18 to fix Timezone issue