Backed out changeset b885a82dc02a (bug 1078108) for breaking B2g ICS Builds