Fixed a merge error in the previous changeset.