[EM] Undo z namespace part from ff5d47a4f2d8e8f91131c1833f61c3d611461a2c