AutoInactiveDestroy fix per RT #95505
Note recent change