Revert "Merge pull request #25420 from gaye/bug-821604" for Gu test failures

This reverts commit 3b98c6a903e79ea16a51832fa4be23f817ab5829, reversing
changes made to 4ee0a68bc71b00808313b21ebd7c3b6a60e98d14.