Fixed a botched merge.