Merge pull request #1603 from TheBlueMatt/2022-07-no-backwards-time