Better server-to-server legcy routing compatibility