Revert "Merge pull request #23603 from EragonJ/bug-1042135" for b2g desktop mochitest-1 failures

This reverts commit b00c0f597a0a0404975fe929230da0b5a805b59c, reversing
changes made to d37950eb09e28aa18d0e01df9ff90574bd4337e0.