Too much copy'n paste between 2.4 and 2.5 code base, attached patch on
top of the previous block tag fixes makes it work/compile again. Sorry
about that.