Revert session variable removal to keep diff minimal.