Restoring ran too often and async

The previous version of the restoring operations needs to be sync and
only run when needed.