upstream changes to uber_router