Revert "Revert "Use new-style UID routing.""

This reverts commit a6b22208ced41e629c75d3c3630f957a2bcbe550.
1 file changed