Remove too early deprecations
Automatic merge from branch-5.0

* origin/branch-5.0:
  Remove too early deprecations