Backed out 2 changesets (bug 860572) for OSX build breakage

Backed out changeset d02e437f5b48 (bug 860572)
Backed out changeset c849d14e7f59 (bug 860572)