Revert "Merge pull request #16435 from evanxd/bug-973876"

This reverts commit 447eb65ee5a7428e3959ac3b1c0a3fbbfc125d43, reversing
changes made to 6894b915ee7d031a1f0ed16c422c48f293de1b84.