Looks like this was missed in a merge conflict resolution