Revert "Use new zone field"

This reverts commit 5a36eed88e4df319fafeb93ec5a82bf6b8c89065.