remove local dispatcher detection because it is not actually useful and causes problems
Merge branch 'remove-dispatcher-detection'