[1.6.x] Fixed #22250 -- regression in gis compiler for non-concrete fields

Thanks to gwahl@fusionbox.com for the report.

Backport of 21f208e66e from master