Get rid of legacy dispatcher.