I did remove "and weight". However it looks like there is missing test, since nothing was breaking. I am also not sure how much we should support the case weight=0.