Backed out changeset 16d6b2e332e0 (bug 975468) for OSX debug non-unified bustage.