excessive #r2only flags removed from #1947