04d6141033
* commit 'dfb33b860f0c936d8af6555835da0ef1aea6c870': Ensure install-during-restore is like install-then-restore