Fix an incomplete merge in the past