I think this is going to break existing sessions when we deploy.