This is in preparation for using the so-called "Goldilocks API" of
Persona where we manage the session ourselves.