Merge "Revert "Add support for wired routing"" into main