fixup backup/rollback strategy. avoid applying the same message twice