Revert "local restore - to be rolled back"

This reverts commit 513349e0e07dd6f688784626d6dd8138608c8538.