- Up to 3.6.0
- Remove patch applied upstream