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