Ideally, yes. You have your thumb directly on point. It's exactly the situation. We have to bring that convention forward in time half a century, or whatever the magic number is, to reflect today's reality. Back then, there were customs and borders between each of these countries, and that's not the case today.
On May 13th, 2010. See this statement in context.