Revert change to country_select