Update for #663399Becca