Reverting to using session explicitly