Fix a regression from some cleanup and how we evaluate zones now