Undo session fix temporarily until issues resolved