Backed out changeset cd821c1ef789 (bug 1037235) for blowing up B2G.