Attempt a fix for Kent's session problem.

Leo build: 20141120113939