fix PR9215, preventing -reassociate from clearing nsw/nuw when