Backed out changesets f488602d26c9 and 09725c69fd76 (bug 860493) for OSX bustage.
CLOSED TREE