Moved zone processing logic into core client and updated hooks to use
new logic.