Add support for older recoveries

Change-Id: Ib81062242ce7f368e786901c3ccba7db11f38f7d