For anyone else reading this:

The PR contains two commits; the first introduces the deprecation while maintaining the historical behaviour, the second then removes the deprecation and changes to the new/desirable behaviour. Obviously, only the first one should be backported.