Port bug 1045128 to comm-central, rs=port by build peer, a=bustage fix for CLOSED TREE.