#2881: Fixes after removing all the routing stuff.