Backed out changeset ec23d10b47eb for build failures on B2G.