choice protocol update for playing nice with log replay