remove skip_if_unavailable param