Don't rely on sketchy `OsDetails.isLinux()` method.
Merge pull request #1034 from aledsage/merge-from-06x/1005

Merge #1005 into master: Don't rely on sketchy `OsDetails.isLinux()` method.