Revert "removed everything related to zone calculations"

This reverts commit f9a9cba2ae82e28b9404a5edbaf59c2af8f664a0.