Agreed.  We don't even have anything making use of the watermarking behavior now, so technically we should delete this for this pull request.  I'll do that for the moment…