Handle change of behavior with session ID being left after session close (see #1685031)