[CC] Fixing the routing thing we just broke