Revert "Fix overlapping contexts issue"

This reverts commit ff0e34e6d93b4344ef7c9c1791d603989ee1bc6f.

This "fix" broke tests in ways I can't quickly fix, so I'm reverting
it so that we have a stable master branch.