No functional change, I reminded Bjorn to merge @z3ntu's pull request so we can drop the patch again. :)