Revert timezone workaround