Merge "Revert "Default to CACHE_ACCEL if user skips advanced settings""