Patch from PR #1833 was broken: there's no s->s3->new_session