Revert "Fix sub-context lookups"

This reverts commit d449766efc08e071d813d36f6c1c812f490b8835.