Fixed accidental changes during merge.