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