Updated patch for 2.9.22-rc1, with different approach so sed isn't required anylonger