2ca717a
Revert "Remove redundant patches" This reverts commit 4ef57b03c1ba19f33f4e6eb88b9a986935b08c81.