Undo custom session key stuff

It's not working.