revert these changes, keeping single context variable