Revert "Merge pull request #17894 from wilsonpage/bug/987071"

This reverts commit 7d2ec45b6e23d72f1c5c3bee9547fbdbea5a5f8b, reversing
changes made to 0f0fb5f485f43729c542c8e608a8532ada68dffb.
Merge pull request #17923 from davidflanagan/bug987071-backout

Revert "Merge pull request #17894 from wilsonpage/bug/987071"