OsDetector now part of core.