Backed out changeset 5d2176af4ed1 (bug 1042771) for frequent b2g r18 failures