Followup r104688, reintroduce the full PathRouter code now that the bug with url...