Port bug 965413 to comm-central, rs=rkent, a=bustage fix for CLOSED TREE