Back out c2f79f1f9e6f (bug 869114) on suspicion of causing dep OS X universal builds to fail in packaging
CLOSED TREE