[dispatch] Use functionality from previous commit

To remove a couple of unwanted wrapper methods
6 files changed