This merges in my 'always use ADS' patch. Tested on a mix of NT and ADS