[1.7.x] Fixed #22497 -- Highlighted difference between field and class deconstruction.

Thanks nliberg for the suggestion.

Backport of b829d53b37 from master