Backed out changeset d6180c846c36 for bustage on a CLOSED TREE
Automatic merge