#72 Roll back change

Bug: sessions aren't available in every scenario