Backed out changeset 487d16b80087 (bug 812638) for mochitest orange.