Backed out 2 changesets (bug 514280) for OSX build bustage on a CLOSED TREE

Backed out changeset 2a015b45d808 (bug 514280)
Backed out changeset a01f97c1ed02 (bug 514280)