dc88f6699d
While the patch worked as intended, we discovered some other concerns
about use of this setting in testing.
This reverts commit 840c1c554d.