Our patch was merged upstream, so let's move to their version.