Backed out changeset 2bca09c404ad (bug 1068597) for breaking non-unified OS X Builds