Avoid mutating collections we iterate over during recovery
Bring back a test that was accidentally deleted
Slight abstraction
Merge bug26111