Another Windows build fix attempt after r153978.