Revert "Revert "Revert "CR248639"""

This reverts commit 81dc00908317cda4d5c55f06b12da7b9fe66055e.