Fix bad merge conflict resolution from 54173d2c