Backed out changeset 8c366a73988c (bug 1087560)
Backed out changeset 508d70d46898 (bug 1087560) for B2G Desktop Linux x64 opt m-oop-1 test failures