Revert "track our own recovery"

This reverts commit f0d2707fa83a2309a028c353b1fed9a674853aec.

Change-Id: If96bebc9b2a43641199cb98e1021ac2db690ae2c