Merge change 8571

* changes:
  Don't leave restore data lying around after the operation