Revert 428b2bd2ea2d73354e15ffad52516105b15576cd as this hides inconsistency between regions and zones.