Some exploits currently succeed, but can fail during cleanup, leading to a false-negative. Reverting this so that the affected exploits can be fixed first. This reverts commits b0858e9d46 and b3f754136e.
b0858e9d46
b3f754136e