Restore Windows build following commit e205153210