Revert "Routing changes"

This reverts commit 0210e0f5a21e801aede330260b4126397d41272b.