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