Fix regression of removing return this