Revert "Merge pull request #17813 from evanxd/bug-987351"

This reverts commit 7efa9ab3234207fd2fd818a5c1411f390619dbfc, reversing
changes made to 89691d2d1a98aef25f3937fbe995413a5d943abe.