Backed out changeset 6c37e11551d8 (bug 1011496) for OSX bustage.
CLOSED TREE