Back out changeset 63d194784378 (bug 1002281) for b2g build bustage
CLOSED TREE