Remove 'include sub-orgs' options. Now always true.