Revert session variable approach