spamassassin: remove hack, insert fix

I think.  So far, so good.