Backed out changeset 6797040a2034 (bug 1089619) for breaking non-unified b2g builds