Fix up recovery

Change-Id: I3ede08c546fd149cd2f4a4f5b277b4609460ef60