Revert "Merge pull request #15268 from
KevinGrandon/bug_959284_suggestions_broken to see if it fixes some Gi
near-permafails"

This reverts commit c3f59299bd357cd86166aba122bb3052d8b3af23, reversing
changes made to 4447def31a77fbeee05cf9d96d1de6651aa715fe.