Fixed erronous merge.