This one was overlooked when migrating to twisted
Merge pull request #599 from whirm/callback_removal

This one was overlooked when migrating to twisted