Revert "Merge pull request #19965 from justindarc/bug1014955"

This reverts commit dbd4e40dd86d0af6bf69a6bb8babee8a5e226be4, reversing
changes made to 7ba9b2f9c727f1021bd4e9b625cd381214002a98.