CountryDropdownField remains in core.