undoing session stuff, needs more work...
Authored by: bloehr 2015-12-16
Parent: [r1484]
Child: [r1486]