Revert null threat changes

I've gone through the other changes, and I believe these two together are a fairly large regression.  I'm not 100% sure why - the idea seems sound.

I'm running a verification test, which is looking very promising, but still early going.  I will update with the results.