IMPORTANT UPDATE: Removes hacks for autodetect for Mac and Windows
Also adds manufacturer line required for this autodetection.