4969. [cleanup] Refactor zone logging functions. [GL #269]
mentioned in commit 056e8acc
mentioned in commit 07b98521