Fix borked git upstream merge.