* commit '45f88e1b2c0a8433b073f69c58660db843d46d04': Clean up properly if outcall for doRestoreFinished() fails