removed patches that were merged upstream