[sr-dev] Dispatcher broken by recent change?