It was also brought to my attention this might have accidentally reintroduced a dependency on the zones/internal package that slipped in because I have that package installed.