Revert "Merge pull request #19058 from evanxd/bug-963394"

This reverts commit 793b7eaec42b0226395f87e87be14c6d50c36a49, reversing
changes made to 876d97f622292948e2f6a32a3996ed2167eab217.
Merge pull request #20013 from gaye/backout-963394

Revert "Merge pull request #19058 from evanxd/bug-963394"