Patches
Plain Diff
This reverts commit a568c382. It was already added before so it create a conflict