Windows build fix after r36071