OZP-770: refactoring restore and share to use legacy services