#1585069 do not keep providers in session