Resolve "Routing under `-` causes issues"
Reverting as part of #118840 (closed)
Reverting both !20455 (merged) and !21126 (merged) on the same MR to reduce conflicts.
Edited by Alessio Caiazza
Reverting as part of #118840 (closed)
Reverting both !20455 (merged) and !21126 (merged) on the same MR to reduce conflicts.