Revert "Fixups for recovery."

This reverts commit a6826f39f3ad96338d82e88bc9b4100afe7fd8dc.