Backed out changeset d36b2edb017b (bug 1014523) for OSX bc1 bustage