Backed out changeset 308fde20a1b1 (bug 1843046) for causing geckoview-junit failures...