Fixed erroneous merge.