cherry pick SKIP_SET_METADATA for older recoveries

not merged yet