Backed out changeset 06714f8dc18c (bug 902909) for OSX bustage on a CLOSED TREE.