Port bug 1050009 to comm-central, rs=Standard, a=bustage fix for CLOSED TREE