Issue #21952:back out change for 21068