Do not need to uppercase country code anymore, fixed in # 707792