Leftover from first merge conflict removed.