Revert "Merge pull request #21665 from EragonJ/bug-1035823" for Gu test
failures on TBPL

This reverts commit ce631d7ada1845ef7ed925a506eb91cda6f09d24.