Fix a "leftover" from the merge