As part of the re-modularization of 3.0, another round of deprecations is going to be necessary for 2.x branch.