Temporarily revert context

Now let's rewrite it so it doesn't suck so much