Comment # 3 on bug 1095041 from Tom���� Chv��tal

Bundling is not really good idea. I would really suggest to grab the upstream
unbunding patch.

If you look at it and ommit the removals it is pretty tiny patchset to get it
rolling.