Reverted some changes

Revert Enable Combo Scan and AIO tweak to increase stability.