Backport zone set fix for stable branch
[jamespage,r=gnuoy] Backport zone set fix for stable branch