Change our routings to be more in-line with Core

Tests are still passing, also manually tested.