Backed out changeset 01d5bde15738 (bug 893973) for OSX bustage.
CLOSED TREE