Fixes NB#130519, country selector picker is too slow