Backed out changeset 7351d473030b (bug 932490) for B2G bustage (again). a=backout
DONTBUILD