Revert "Updated patches"

This reverts commit 0f7f6a1dbbb9e5082f64ecb01332eb9397a0be33.