This restores the pre-2.31 handling of ZoneID identifiers in store references. It's the only place we reasonably care about this back-compat.
This restores the pre-2.31 handling of ZoneID identifiers in store references. It's the only place we reasonably care about this back-compat.