Revert collision dispatcher; causes a crash