Partial revert of 624498d, using a better routing approach using the *-operator