Revert "Merge pull request #18255 from evanxd/bug-988516"

This reverts commit 28933e686babd4d95b37e6056e4febc0480ff759, reversing
changes made to 68d8e6897f326a8980c81da80bf8a76440ef3faf.
Merge pull request #18264 from gaye/revert-28933e686babd4d95b37e6056e4febc0480ff759

Revert "Merge pull request #18255 from evanxd/bug-988516"