Fix botched merge.