am 81c1d8d3: Ensure install-during-restore is like install-then-restore

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