Backed out changeset 8f55490fb539 (bug 1614890) for causing awsy fail…
a5108f4
…ures. [ghsync] From https://hg.mozilla.org/mozilla-central/rev/63acd82c9360389a6dbd3bdf223e48bf32ca25c1
