backout b707277861fc (bug 903513) for mac bustage