This commit fixes a missed correction during merge with conflicts. See 3f2d86ffc7 Issue gh-14242
3f2d86ffc7