Revert "Remove "time travelling if statements" (trying to understand github build failure)"

This reverts commit 23edb798b21c62993419a852e23f4808228f17a4.