issue #19291: removed old XXX
issue #19291: tweaked session functor per client expectations