Backed out changeset 944bd4284ace (bug 1063053) for B2G bustage.