Simplify logic to match what we do for the Replayer