why code changes?  this branch/pr should *only* contain deprecation and comments so we can get this into 2.7 w/o having to worry about side-effects, then we can remove/clean up in 2.8.