Switch to package_options from package_overrides