revert timezone fix, add comments