Fix bad upstream merge.