remove fallback to default-dispatcher, see #3394