Backed out changeset 46519785800d (bug 847809) for B2G bustage.