Revert "Tags are broken"

This reverts commit c6df1f0420257be687e137fcb5e1e985e49b281d.
Commented out the routing code