Revert "rework on recovery"

This reverts commit 2ab7b98fbc12c404894d71aa4cbc4e5433f50730.