Backed out changeset 9d673e562fa6 (bug 945023) for OSX bustage.