Fix accidental change while merging