Oops, a leftover from the merge