Fix for bug #861212 and upstream htmlfilter version commits that
require it. Please test, see if I broke it. I could only do rudimentary
testing, as the testbox I use is having bandwidth issues. :(