Back out babac1cc0741:ad287f78608a (bug 939049) for OS X build bustage
CLOSED TREE