Backed out changeset 31993b8e06cc (bug 959499) for breaking B2G mochitests.
CLOSED TREE