#9313 - back to using full country list