Fix previous merge: use the version of get_category_options that came from the taxonomies branch, not the staging branch.