Revert the context __init__ refactor