Backed out changeset 3f9482614123 (bug 1598380) as requested by jnico…
3c6cd0d
…l for causing a regression. [wrupdater] From https://hg.mozilla.org/mozilla-central/rev/ee4d1ff71f58952162907aa41ef891f6eedea58b
