Fix up our recovery and remove or first touch recovery

Change-Id: I4f7293d5e35f1c6bdd3523c446b2583e0faa3176