Unreviewed attempt to fix Windows build after r230875.