Fix another merge conflict between commits d306c75 and 2c888ab