Revert "Merge pull request #9227 from evelynhung/uplift-847851-v1.0.1"

This reverts commit e7f13fb1577dd613bea4a7908da3920089eb2ad1, reversing
changes made to 1a2aa3200eb5997c643ba349bf67b55170796a56.