Revert to r3p2-01rel2