Instead it is another cleanup which should go the usual way = apply in HEAD, propose for backport. Please lets separate these things - the bigger we make the one 2.2.x backport patch the lesser the other developers are in the mood to review it.
I agree.