removed one patch which seems to be upstream now