ND2: respect the 'bUseZ' setting

Fixes #10247.