Skip generation of separate recovery

Change-Id: I4e966ad1e91653c1011b14d8dc65ead120e78aae