Keep out of other recovery variants

Change-Id: Iefeb4460496ea3877d6624cbe973f1d7ea0f4ff0