This is definitely a potential merge conflict if some upstream commit changes the API for this function, but it's also a simple function to fix if that happens.  My proposal to resolve this was to try and merge this change upstream, since it seems useful.