Backed out changeset 24668220c9a4 (bug 952507) for OS X Build Bustage on a CLOSED TREE