This is an updated version of the gen_estimator fix
that relies on all changes happening under the rtnl
and just fixes the race between timer rearming and
timer removal.