Put cbsFindInZones back where it was (moving it broke the build).