Backported from trunk (rev #9957):
prevent REINVITEs from overwriting acc internal structures