moved to new reroute version w/o PolyKinds