Roll back array-specific changes through D19607758