Backed out changeset a32d62b69434 (bug 879666) for B2G test bustage.