Port bug 1094037 to comm-central to fix bustage, rs=build port by build peer, a=bustage-fix