Revert "Added a Context type for non-global contexts."

This reverts commit bbd3ed3168245e982981e22ebc2de0e3739ab8a5.