Raise a PR for this upstream. :)