Backed out changeset 01bbf35c82bd (bug 1045958) for B2G Desktop OS X build bustage on a CLOSED TREE.