Draft: 3517632: This code change fixes the route but I don't think the behavior is restored.

Needs work. And a review. I'm pretty convinced there's more to do.