Roll back CHG0072896

CHG0072975 Roll back CHG0072896