r22343: Commit to 3_0 as well after adapting the patch.