Patch previous 'fix', OS detection overriding support.