Revert "Merge pull request #26163 from kanru/bug-1098118"

This reverts commit 488c8369d4e06745d0e452b7887abf2af44a8e6c, reversing
changes made to 046e2783d2be7b6103a7220aa691fd14f4acb76a.