This relands commit cd7f8051ac7b6f08734102446482c1e5d951bfcc 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 caa423eef0d128f35ac11ddbce34964caafb61c1.