Remove vestigial code, fixes #17321, refs #14058.
Thanks Simon.
(cherry picked from commit a43c360fb0d3c7421bd22182cc65cf0638843eb0)