Backed out changeset de34cb8506d9 (bug 1040230)
Backed out changeset 3ee28802c28c (bug 1024930) for causing B2G mochitest-debug-14 failures