Issue #22386: fixed regression.