Revert "make stepper work without a context"

This reverts commit c5707f67fa08c0b406f057fbc3839d216097f1ad.