fix zn_ tables for non-gcl

(cherry picked from commit fc3f8b9e6d3b7f5d0057552a6b2d4c05beb89118)