Revert "Ensure install-during-restore is like install-then-restore"

This reverts commit 77b2f424553c29c3d1d607ef94110cf09e0d9e5b.