Revert "Merge pull request #17243 from wilsonpage/bug/979285"

This reverts commit ed794d89721e1798177babd6001d57cb15754021, reversing
changes made to 2f9d1662770a2f2edf5a6dc697ab81ff48ecaa9e.