Issue #21952:back out change for 21068
Merge pull request #94 from garyhgohoos/21952

Issue #21952:back out change for 21068