Use retain_on_success parameter

This means we need one less API call.