1c99db293d
While the patch worked as intended, we discovered some other concerns
about use of this setting in testing.
This reverts commit 96315c3478.