This really should have been in a separate pull request. It is not related to routing.