Backout commit faa8a0c2

https://bugzilla.mozilla.org/show_bug.cgi?id=938564