This relands commit cd7f8051 that was reverted since lower threshold have successfully found an issue. Now that the issue is fixed, let's wait until the next one is reported. This reverts commit caa423ee.
mentioned in commit 4500db8c