Revert "Update recovery stuff"

This reverts commit 9c439c9253bf6f7b90e6fd3333b9cd4d1ec27519.