Right now 3.0 because by the project's updated development strategy, we can't deprecate something at 2.0 and remove it in 2.0.  Without a separate PR deprecating that stuff and us tagging a new 1.x release, that's the earliest we can drop that code.