Bad broken router stuff
Revert "Bad broken router stuff"

This reverts commit 238480ca2978351df087cec9d61eb0ff236b1cb3.