Fixed up a botched merge.
Fixed botched merge.