drop from hg of 1.0.0alpha2 pt2