* disabled the rerouting speedup from ad7334f