Revert V2.2:r3p2