Yet another Windows build fix attempt after r153978.