Revert "Revert "Patches""

This reverts commit 274e6a4e5091ba854fa7a419b4f9a844450683c3.