Additional patch for #83850: Please consider deprecating CINTAUTOLINK (Christian)