Revert "Still working on router issue :("

This reverts commit 0cec4ccc1e952ab0549cd2fe7daf73990fe8a15e.