I've already pushed 2.2 in which I did exactly that :)