Backed out changeset c9b9eb9d31a8 (bug 935672) for B2G desktop M1 failures.