Backed out changeset 7268c16cad16 (bug 829747) for causing B2G test timeouts; CLOSED TREE