Last change also requires a change to Router.