On another note though, I don't think we need an OS check here, see my comment in #625