Backed out changeset b6b911ca4dd8 (bug 837202) for OSX bustage.
CLOSED TREE