Back out f08e636ecdc4 (bug 792935) for mochitest failures