fix router/block unlinking, #29829, from #20742