replaced patch with upstream version