Revert:AIO Optimization compatibility fixup