Revert "remove patches for now"

This reverts commit 5e3c113a66ff785cc66365ef5524bad05bc9b4ec.