Revert "Merge pull request #16301 from wilsonpage/bug/972701"

This reverts commit d76e2742d251709c76cc297e25e79dd2170c8bb4, reversing
changes made to bad5658f1c678191e21984d3217a4ad2bfad3c94.
Merge pull request #16538 from davidflanagan/revert972701

Revert "Merge pull request #16301 from wilsonpage/bug/972701"