Backported: scoped_session is all that we need