Backed out changeset c9fed3a62c90 (bug 865929) for B2G test bustage. a=bustage