c6d4e3d
Revert "Remove patch applied upstream" This reverts commit 30f111b11681c7c8ef99afee6cee774d7de3b07e.