Windows build fix after r95310