Revert "Routing changes"

This reverts commit ceb28376521df6beda91b828eaa70e46c50f53b3.