Back out bug 886499 for b2g build bustage.