Revert "Merge pull request #15702 from davidflanagan/bug959049"

This reverts commit cfeb5bf7e7665e4be412d1f774bd46fadeff3c93, reversing
changes made to a9a4e7bbcf55d1bd0a0d441f7dcc6271cc2dc6b1.
Merge pull request #15891 from davidflanagan/revert959049

Revert "Merge pull request #15702 from davidflanagan/bug959049"