Backed out changeset 81a51de30a2a (bug 997244) for breaking b2g emulator mochitests on an otherwise CLOSED TREE