Revert 1707 Fixes, was a Timezone problem