Unreviewed, attempt to fix Windows build after r207787