Revert "After restoring local folder from backup"

This reverts commit 4f128b4b567eef43968209bd1c1ce87f7d788566.
Revert "Revert "After restoring local folder from backup""

This reverts commit 630e4f959687aff05b72cc7969fafb47495c463b.
Revert "After restoring local folder from backup"

This reverts commit 4f128b4b567eef43968209bd1c1ce87f7d788566.