Revert "Ensure `context` is passed to super-ctor"