Reverted session-handling