Rolling back to pre-ACF eff-up