Fix broken chsk router shutdown due to http://goo.gl/be8CGP