More thorough rollback