Merge "Don't assume how many crashes to trigger rollback (1/n)"