Revert "Merge pull request #22068 from mancas/bug929311"

This reverts commit c0a8cebe31c49a90c443226710aef36c1e62bdc2, reversing
changes made to 89b3cd51330ae0ae848057a8d453c252e147e61d.