As documented and decided in #3185. Can we begin with adding deprecation warnings or is this hard to implement?