RE: Windows build broken (again)