Remove r2 from master version.