369.17 Removed experimental __PLAN_R2 code for release