Merge "Rewrite how we abandon sessions"