Bug 1062630 - Port bug 1041941 to c-c, r=jcranmer CLOSED TREE