Revert "fixed a few routing bugs"

This reverts commit 94ca394848d79f5b606a99f47614820a8ba5406e.