Backed out changeset 824144dd7cdf (bug 1039633) for OSX build errors