Backed out changesets c42b68e0db15 and 6e2c7dd63fcf (bug 879717) due to mochitest orange.