Reintroduce the Windows support