Blocking revision 8808 from trunk. It's already fixed in trunk.