It would still be good to try and upstream such things (partly as well so we can find out if there's a good reason for them not doing this already).