Fix changes from upstream merge.