Revert null threat changes