Back out d280a1c64f76 (bug 939585) for Mac build bustage
CLOSED TREE