Revert "Removing 0001 quilt patch as we this conflicts with our ci"

This reverts commit 49c2a5ef14d3a2180f66514e55c977b60b70dfce.