Revert "Make routing work properly this time."

This reverts commit fa971ecfadf9b27ae797b3aa6913378de74dc01c.