Close issue #22895: fix test failure introduced by the fix for issue #22462.
Close issue #22895: fix test failure introduced by the fix for issue #22462.