tsan: reapply 212531 and 212532 with a fix
don't reset s->addr as well