Revert edit_session changes
Almost working draft