Revert to its initial format on map_store, as we want to keep backward
compatibility