TEZ-854. Fix non-recovery code path for sessions. (hitesh)