Backed out changeset ae2b07dfd3d0 (bug 875218) because of build bustage on a CLOSED TREE