Speculative fix for Windows build after r220932