Return previous callbacks

A second attempt of #75, but this time against the right branch.