Fix leftover from an erroneous merge