Revert "Revert "Revert "Patches"""

This reverts commit 71925e48e9d038a84231e3d3c6ec3caff7e741c1.