Backed out changeset 5432f96b6ba0 (bug 899855) for B2G test bustage.
CLOSED TREE