If we want/need to do that, then we can create the 3.0 branch and backport the 2.2.2 fix when it's available.