Option no_separate_recovery is back