Backed out changesets 3d388fb26b80 and d19900a57d64 (bug 948777) for bustage on a CLOSED TREE.