Added rerolled patch against 2.0.1 decouple_router branch.