Fix silent merge conflict introduced in d3ddf15357589ed10f4c844dc22