This is a recommit. The original commit was backed out due to mochitest
failures. Those failures have (hopefully) been fixed in previous
commits. philikon did not explicitly r+ this commit, but the original
patch. There is an implicit a=bustage on the commit because the tree is
broken and this patch should have been included with the mochitest fix
commit.