As far as I can tell, nothing actually returns ROUTER_ADDED_NOTIFY_GENERATOR. I think that means we can just get rid of it?