Add ability to enable or disable recovery

Change-Id: I3b80c0fa7720490b017bab31edd7e019a37b6250