issue #23507: non-nettable refactor

A remerge of #1774