Revert "Context is updated, return it. Also avoid recursion error."

This reverts commit 12fa5deb8220b12e21b44524751cc515796bf219.
Revert "Oops, do not return new_context just yet, update and then return"

This reverts commit 73848ab99035e9b6d0bb6cf2f0483d70aac22b62.