Backed out changesets 4cd69faa8bc0 and 54252e150439 (bug 976963) for B2G mochitest failures.