MT#5879 Remove country_name wrapper.