[1.6.x] Fixed bad backport in last commit; refs #21118