Drop patches committed upstream