When the Caliphate collapsed in the 1920s, it was at first a mishmash of ethnic and linguistic states that quickly pulled together into the Coalition of Islamic States. So what if the Caliphate stayed that way, as a confused jumble of states? It technically is that today, but the CIS has centralized enough that it can be counted as one country, IMO.