Undo: Fix leech toast

See PR #282. Lots of people have been complaining about this. I'll undo this for now and work on a better solution in `develop`.