Revert "Merge pull request #20033 from eeejay/bug-1020605"

This reverts commit 763b7f62805570b1606b8738075318020af3fa7d, reversing
changes made to e794eeb8dcb308cd7b1580717ef38e2880987634.