Port bug 1084151 to comm-central, rs=port by build system peer, a=jcranmer