domain-scoped token has "None" for tenant_id replacement

When I get a domain-scoped token, I get back a catalog. The catalog contains a bunch of endpoints that aren't valid because the tenant_id replacement has been changed to "None" rather than a valid tenant-id.

Here's an example of the data in the auth request:

{
    "token": {
        "catalog": [
            {
                "endpoints": [
                    {
                        "id": "247c60ab8ce94cac9bd6de51ad3a5da4",
                        "interface": "internal",
                        "legacy_endpoint_id": "677bffa798da42c594fb536f9e549f84",
                        "region": "RegionOne",
                        "url": "http://192.168.122.176:8774/v2/None"
                    },
                    ...
                ],
                "id": "425a93743a7d46708d55f7f099bf1a07",
                "type": "compute"
            },
            ...
}

The compute endpoint in Keystone is like this:

| 677bffa798da42c594fb536f9e549f84 | RegionOne | http://192.168.122.176:8774/v2/$(tenant_id)s | http://192.168.122.176:8774/v2/$(tenant_id)s | http://192.168.122.176:8774/v2/$(tenant_id)s | 425a93743a7d46708d55f7f099bf1a07 |

So it's replacing "$(tenant_id)s" with "None"

I don't think this is working as designed. What's the point of providing a bunch of invalid endpoints?