* commit 'fcfc99c064f0b91fa419784bd90bb9944b9ab9f4': Ensure install-during-restore is like install-then-restore