Revert: Recovery:Fixes and Update (reverted from commit 2bd570de7be24aa4c4aa833decff4266465a5c3b)