Complete curious half-checkin. Refs #16256. Fixes #16947.