Fix-up after botched merge.