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