reverting back commits r20969 and r20971, as we sadly recognized that the generated routes are not valid in the context of the transit-mobsim. As this seems to be a problem by design, the commits are reverted and the problems have to be solved on another way.