SCCM OSD Fails when disks set to AHCI and using Windows source

Unless the laptops have their disks set to ATA mode, I can't use these CAB files in a driver package to an SCCM deployment that uses Windows 7 source files (Windows error unable to load the boot-critical Intel AHCI driver). I've tried versions 8.9.4.1004, 9.5.7.1002 and 9.6.0.1014 and all with no lock (the lowest version is the one in the above PE Cab file, the middle version the one in the CAB files for the laptop models 6410, 6510, 4310 and M4500, and the higher one the one from the Dell pages if you search for specific models.
If you use a WIM file to install the OS in the task sequence then it works OK.