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