If we stick to this monkey-patch, can we make this happen only when on windows?