Merge pull request #1 from gburton/master

Backout $_session