EUCA-7708, removing hardcoding of default location to US