Fix issue from upstream merge.